Changeset 206772 in webkit


Ignore:
Timestamp:
Oct 4, 2016 9:53:43 AM (7 years ago)
Author:
commit-queue@webkit.org
Message:

[SOUP] Remove SSLPolicyFlags from SoupNetworkSession
https://bugs.webkit.org/show_bug.cgi?id=162906

Patch by Carlos Garcia Campos <cgarcia@igalia.com> on 2016-10-04
Reviewed by Michael Catanzaro.

Source/WebCore:

All soup based ports are setting SSLUseSystemCAFile flag unconditionally, so we can just use that when creating
the session like we do for all other construct parameters.

  • platform/network/soup/SoupNetworkSession.cpp:

(WebCore::SoupNetworkSession::createTestingSession):
(WebCore::SoupNetworkSession::setupLogger):
(WebCore::SoupNetworkSession::SoupNetworkSession): Deleted.
(WebCore::SoupNetworkSession::clearOldSoupCache): Deleted.
(WebCore::SoupNetworkSession::setHTTPProxy): Deleted.

  • platform/network/soup/SoupNetworkSession.h:

(WebCore::SoupNetworkSession::soupSession): Deleted.

Source/WebKit2:

  • NetworkProcess/soup/NetworkProcessMainSoup.cpp:

(WebKit::NetworkProcessMainUnix):

Location:
trunk/Source
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r206771 r206772  
     12016-10-04  Carlos Garcia Campos  <cgarcia@igalia.com>
     2
     3        [SOUP] Remove SSLPolicyFlags from SoupNetworkSession
     4        https://bugs.webkit.org/show_bug.cgi?id=162906
     5
     6        Reviewed by Michael Catanzaro.
     7
     8        All soup based ports are setting SSLUseSystemCAFile flag unconditionally, so we can just use that when creating
     9        the session like we do for all other construct parameters.
     10
     11        * platform/network/soup/SoupNetworkSession.cpp:
     12        (WebCore::SoupNetworkSession::createTestingSession):
     13        (WebCore::SoupNetworkSession::setupLogger):
     14        (WebCore::SoupNetworkSession::SoupNetworkSession): Deleted.
     15        (WebCore::SoupNetworkSession::clearOldSoupCache): Deleted.
     16        (WebCore::SoupNetworkSession::setHTTPProxy): Deleted.
     17        * platform/network/soup/SoupNetworkSession.h:
     18        (WebCore::SoupNetworkSession::soupSession): Deleted.
     19
    1202016-10-04  Wenson Hsieh  <wenson_hsieh@apple.com>
    221
  • trunk/Source/WebCore/platform/network/soup/SoupNetworkSession.cpp

    r206732 r206772  
    112112        SOUP_SESSION_ADD_FEATURE, cookieJar,
    113113        SOUP_SESSION_USE_THREAD_CONTEXT, TRUE,
     114        SOUP_SESSION_SSL_USE_SYSTEM_CA_FILE, TRUE,
     115        SOUP_SESSION_SSL_STRICT, FALSE,
    114116        nullptr);
    115117
     
    194196            g_unlink(filename.get());
    195197    }
    196 }
    197 
    198 void SoupNetworkSession::setSSLPolicy(SSLPolicy flags)
    199 {
    200     g_object_set(m_soupSession.get(),
    201         SOUP_SESSION_SSL_USE_SYSTEM_CA_FILE, flags & SSLUseSystemCAFile ? TRUE : FALSE,
    202         SOUP_SESSION_SSL_STRICT, flags & SSLStrict ? TRUE : FALSE,
    203         nullptr);
    204 }
    205 
    206 SoupNetworkSession::SSLPolicy SoupNetworkSession::sslPolicy() const
    207 {
    208     gboolean useSystemCAFile, strict;
    209     g_object_get(m_soupSession.get(),
    210         SOUP_SESSION_SSL_USE_SYSTEM_CA_FILE, &useSystemCAFile,
    211         SOUP_SESSION_SSL_STRICT, &strict,
    212         nullptr);
    213 
    214     SSLPolicy flags = 0;
    215     if (useSystemCAFile)
    216         flags |= SSLUseSystemCAFile;
    217     if (strict)
    218         flags |= SSLStrict;
    219     return flags;
    220198}
    221199
  • trunk/Source/WebCore/platform/network/soup/SoupNetworkSession.h

    r205556 r206772  
    4848    static std::unique_ptr<SoupNetworkSession> createForSoupSession(SoupSession*);
    4949
    50     enum SSLPolicyFlags {
    51         SSLStrict = 1 << 0,
    52         SSLUseSystemCAFile = 1 << 1
    53     };
    54     typedef unsigned SSLPolicy;
    55 
    5650    SoupSession* soupSession() const { return m_soupSession.get(); }
    5751
     
    6054
    6155    static void clearOldSoupCache(const String& cacheDirectory);
    62 
    63     void setSSLPolicy(SSLPolicy);
    64     SSLPolicy sslPolicy() const;
    6556
    6657    void setupHTTPProxyFromEnvironment();
  • trunk/Source/WebKit2/ChangeLog

    r206771 r206772  
     12016-10-04  Carlos Garcia Campos  <cgarcia@igalia.com>
     2
     3        [SOUP] Remove SSLPolicyFlags from SoupNetworkSession
     4        https://bugs.webkit.org/show_bug.cgi?id=162906
     5
     6        Reviewed by Michael Catanzaro.
     7
     8        * NetworkProcess/soup/NetworkProcessMainSoup.cpp:
     9        (WebKit::NetworkProcessMainUnix):
     10
    1112016-10-04  Wenson Hsieh  <wenson_hsieh@apple.com>
    212
  • trunk/Source/WebKit2/NetworkProcess/soup/NetworkProcessMainSoup.cpp

    r200233 r206772  
    3030#include "ChildProcessMain.h"
    3131#include "NetworkProcessMainUnix.h"
    32 #include <WebCore/SoupNetworkSession.h>
    33 #include <libsoup/soup.h>
    34 
    35 using namespace WebCore;
    3632
    3733namespace WebKit {
    3834
    39 class NetworkProcessMain final: public ChildProcessMainBase {
    40 public:
    41     bool platformInitialize() override
    42     {
    43         SoupNetworkSession::defaultSession().setSSLPolicy(SoupNetworkSession::SSLUseSystemCAFile);
    44         return true;
    45     }
    46 };
    47 
    4835int NetworkProcessMainUnix(int argc, char** argv)
    4936{
    50     return ChildProcessMain<NetworkProcess, NetworkProcessMain>(argc, argv);
     37    return ChildProcessMain<NetworkProcess, ChildProcessMainBase>(argc, argv);
    5138}
    5239
Note: See TracChangeset for help on using the changeset viewer.