Diff
Modified: trunk/Source/WebCore/ChangeLog (265149 => 265150)
--- trunk/Source/WebCore/ChangeLog 2020-07-31 17:44:19 UTC (rev 265149)
+++ trunk/Source/WebCore/ChangeLog 2020-07-31 17:54:46 UTC (rev 265150)
@@ -1,3 +1,23 @@
+2020-07-31 Youenn Fablet <[email protected]>
+
+ Update service worker if certificate info does not match when soft updating
+ https://bugs.webkit.org/show_bug.cgi?id=214988
+
+ Reviewed by Alex Christensen.
+
+ In case service worker certificate info does not match, treat it as if the script changed.
+ This is a convenient way to update the service worker and the stored registration database.
+ Covered by API test.
+
+ * platform/network/cf/CertificateInfo.h:
+ * platform/network/cf/CertificateInfoCFNet.cpp:
+ (WebCore::certificatesMatch):
+ * workers/service/server/SWServerJobQueue.cpp:
+ (WebCore::doCertificatesMatch):
+ (WebCore::SWServerJobQueue::scriptFetchFinished):
+ * workers/service/server/SWServerWorker.h:
+ (WebCore::SWServerWorker::certificateInfo const):
+
2020-07-31 Sihui Liu <[email protected]>
-[WKWebsiteDataStore _renameOrigin:] needs to support IndexedDB renames
Modified: trunk/Source/WebCore/platform/network/cf/CertificateInfo.h (265149 => 265150)
--- trunk/Source/WebCore/platform/network/cf/CertificateInfo.h 2020-07-31 17:44:19 UTC (rev 265149)
+++ trunk/Source/WebCore/platform/network/cf/CertificateInfo.h 2020-07-31 17:54:46 UTC (rev 265150)
@@ -97,6 +97,8 @@
mutable RetainPtr<CFArrayRef> m_certificateChain;
};
+WEBCORE_EXPORT bool certificatesMatch(SecTrustRef, SecTrustRef);
+
} // namespace WebCore
namespace WTF {
Modified: trunk/Source/WebCore/platform/network/cf/CertificateInfoCFNet.cpp (265149 => 265150)
--- trunk/Source/WebCore/platform/network/cf/CertificateInfoCFNet.cpp 2020-07-31 17:44:19 UTC (rev 265149)
+++ trunk/Source/WebCore/platform/network/cf/CertificateInfoCFNet.cpp 2020-07-31 17:54:46 UTC (rev 265150)
@@ -32,6 +32,28 @@
namespace WebCore {
+bool certificatesMatch(SecTrustRef trust1, SecTrustRef trust2)
+{
+ if (!trust1 || !trust2)
+ return false;
+
+ CFIndex count1 = SecTrustGetCertificateCount(trust1);
+ CFIndex count2 = SecTrustGetCertificateCount(trust2);
+ if (count1 != count2)
+ return false;
+
+ for (CFIndex i = 0; i < count1; i++) {
+ auto cert1 = SecTrustGetCertificateAtIndex(trust1, i);
+ auto cert2 = SecTrustGetCertificateAtIndex(trust2, i);
+ RELEASE_ASSERT(cert1);
+ RELEASE_ASSERT(cert2);
+ if (!CFEqual(cert1, cert2))
+ return false;
+ }
+
+ return true;
+}
+
#if PLATFORM(COCOA)
RetainPtr<CFArrayRef> CertificateInfo::certificateChainFromSecTrust(SecTrustRef trust)
{
Modified: trunk/Source/WebCore/workers/service/server/SWServerJobQueue.cpp (265149 => 265150)
--- trunk/Source/WebCore/workers/service/server/SWServerJobQueue.cpp 2020-07-31 17:44:19 UTC (rev 265149)
+++ trunk/Source/WebCore/workers/service/server/SWServerJobQueue.cpp 2020-07-31 17:54:46 UTC (rev 265150)
@@ -57,6 +57,16 @@
return !m_jobQueue.isEmpty() && firstJob().identifier() == jobDataIdentifier;
}
+static bool doCertificatesMatch(const CertificateInfo& first, const CertificateInfo& second)
+{
+#if PLATFORM(COCOA) && HAVE(SEC_TRUST_SERIALIZATION)
+ return first.trust() == second.trust() || certificatesMatch(first.trust(), second.trust());
+#else
+ // FIXME: Add support for certificate matching in CertificateInfo.
+ return true;
+#endif
+}
+
void SWServerJobQueue::scriptFetchFinished(const ServiceWorkerFetchResult& result)
{
if (!isCurrentlyProcessingJob(result.jobDataIdentifier))
@@ -88,7 +98,8 @@
// If newestWorker is not null, newestWorker's script url equals job's script url with the exclude fragments
// flag set, and script's source text is a byte-for-byte match with newestWorker's script resource's source
// text, then:
- if (newestWorker && equalIgnoringFragmentIdentifier(newestWorker->scriptURL(), job.scriptURL) && result.script == newestWorker->script()) {
+ if (newestWorker && equalIgnoringFragmentIdentifier(newestWorker->scriptURL(), job.scriptURL) && result.script == newestWorker->script() && doCertificatesMatch(result.certificateInfo, newestWorker->certificateInfo())) {
+ RELEASE_LOG(ServiceWorker, "%p - SWServerJobQueue::scriptFetchFinished, script and certificate are matching for registration ID: %llu", this, registration->identifier().toUInt64());
// FIXME: for non classic scripts, check the script’s module record's [[ECMAScriptCode]].
// Invoke Resolve Job Promise with job and registration.
Modified: trunk/Source/WebCore/workers/service/server/SWServerWorker.h (265149 => 265150)
--- trunk/Source/WebCore/workers/service/server/SWServerWorker.h 2020-07-31 17:44:19 UTC (rev 265149)
+++ trunk/Source/WebCore/workers/service/server/SWServerWorker.h 2020-07-31 17:54:46 UTC (rev 265150)
@@ -81,6 +81,7 @@
const ServiceWorkerRegistrationKey& registrationKey() const { return m_registrationKey; }
const URL& scriptURL() const { return m_data.scriptURL; }
const String& script() const { return m_script; }
+ const CertificateInfo& certificateInfo() const { return m_certificateInfo; }
WorkerType type() const { return m_data.type; }
ServiceWorkerIdentifier identifier() const { return m_data.identifier; }
Modified: trunk/Source/WebKit/ChangeLog (265149 => 265150)
--- trunk/Source/WebKit/ChangeLog 2020-07-31 17:44:19 UTC (rev 265149)
+++ trunk/Source/WebKit/ChangeLog 2020-07-31 17:54:46 UTC (rev 265150)
@@ -1,3 +1,18 @@
+2020-07-31 Youenn Fablet <[email protected]>
+
+ Update service worker if certificate info does not match when soft updating
+ https://bugs.webkit.org/show_bug.cgi?id=214988
+
+ Reviewed by Alex Christensen.
+
+ Make sure service worker soft updater gathers certificate info.
+
+ * NetworkProcess/ServiceWorker/ServiceWorkerSoftUpdateLoader.cpp:
+ (WebKit::ServiceWorkerSoftUpdateLoader::loadFromNetwork):
+ (WebKit::ServiceWorkerSoftUpdateLoader::didReceiveResponse):
+ * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
+ (WebKit::NetworkSessionCocoa::allowsSpecificHTTPSCertificateForHost):
+
2020-07-31 Sihui Liu <[email protected]>
-[WKWebsiteDataStore _renameOrigin:] needs to support IndexedDB renames
Modified: trunk/Source/WebKit/NetworkProcess/ServiceWorker/ServiceWorkerSoftUpdateLoader.cpp (265149 => 265150)
--- trunk/Source/WebKit/NetworkProcess/ServiceWorker/ServiceWorkerSoftUpdateLoader.cpp 2020-07-31 17:44:19 UTC (rev 265149)
+++ trunk/Source/WebKit/NetworkProcess/ServiceWorker/ServiceWorkerSoftUpdateLoader.cpp 2020-07-31 17:54:46 UTC (rev 265150)
@@ -125,6 +125,7 @@
parameters.storedCredentialsPolicy = StoredCredentialsPolicy::Use;
parameters.contentSniffingPolicy = ContentSniffingPolicy::DoNotSniffContent;
parameters.contentEncodingSniffingPolicy = ContentEncodingSniffingPolicy::Sniff;
+ parameters.needsCertificateInfo = true;
parameters.request = WTFMove(request);
m_networkLoad = makeUnique<NetworkLoad>(*this, nullptr, WTFMove(parameters), session);
m_networkLoad->start();
@@ -137,8 +138,7 @@
void ServiceWorkerSoftUpdateLoader::didReceiveResponse(ResourceResponse&& response, ResponseCompletionHandler&& completionHandler)
{
- // FIXME: If the certificate info changes but the script content does not, treat that as an update.
- m_certificateInfo = response.certificateInfo() ? *response.certificateInfo() : CertificateInfo();
+ m_certificateInfo = *response.certificateInfo();
if (response.httpStatusCode() == 304 && m_cacheEntry) {
loadWithCacheEntry(*m_cacheEntry);
completionHandler(PolicyAction::Ignore);
Modified: trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm (265149 => 265150)
--- trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2020-07-31 17:44:19 UTC (rev 265149)
+++ trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2020-07-31 17:54:46 UTC (rev 265150)
@@ -1471,28 +1471,6 @@
#endif
}
-static bool certificatesMatch(SecTrustRef trust1, SecTrustRef trust2)
-{
- if (!trust1 || !trust2)
- return false;
-
- CFIndex count1 = SecTrustGetCertificateCount(trust1);
- CFIndex count2 = SecTrustGetCertificateCount(trust2);
- if (count1 != count2)
- return false;
-
- for (CFIndex i = 0; i < count1; i++) {
- auto cert1 = SecTrustGetCertificateAtIndex(trust1, i);
- auto cert2 = SecTrustGetCertificateAtIndex(trust2, i);
- RELEASE_ASSERT(cert1);
- RELEASE_ASSERT(cert2);
- if (!CFEqual(cert1, cert2))
- return false;
- }
-
- return true;
-}
-
bool NetworkSessionCocoa::allowsSpecificHTTPSCertificateForHost(const WebCore::AuthenticationChallenge& challenge)
{
const String& host = challenge.protectionSpace().host();
@@ -1508,7 +1486,7 @@
return false;
RetainPtr<SecTrustRef> trust = adoptCF(trustRef);
- return certificatesMatch(trust.get(), challenge.nsURLAuthenticationChallenge().protectionSpace.serverTrust);
+ return WebCore::certificatesMatch(trust.get(), challenge.nsURLAuthenticationChallenge().protectionSpace.serverTrust);
}
void NetworkSessionCocoa::continueDidReceiveChallenge(SessionWrapper& sessionWrapper, const WebCore::AuthenticationChallenge& challenge, NegotiatedLegacyTLS negotiatedLegacyTLS, NetworkDataTaskCocoa::TaskIdentifier taskIdentifier, NetworkDataTaskCocoa* networkDataTask, CompletionHandler<void(WebKit::AuthenticationChallengeDisposition, const WebCore::Credential&)>&& completionHandler)
Modified: trunk/Tools/ChangeLog (265149 => 265150)
--- trunk/Tools/ChangeLog 2020-07-31 17:44:19 UTC (rev 265149)
+++ trunk/Tools/ChangeLog 2020-07-31 17:54:46 UTC (rev 265150)
@@ -1,3 +1,30 @@
+2020-07-31 Youenn Fablet <[email protected]>
+
+ Update service worker if certificate info does not match when soft updating
+ https://bugs.webkit.org/show_bug.cgi?id=214988
+
+ Reviewed by Alex Christensen.
+
+ Update HTTPServer to pass two optional parameters:
+ - A port number to listen to if provided
+ - A custom server identity to use if provided
+
+ The API test is loading an URL on a first server.
+ This triggers registration of a service worker.
+ It then stops this server and launches a second server on the same port with a different certificate.
+ A second page is loaded on the same URL.
+ This triggers the case of updating a service worker certificate info.
+
+ * TestWebKitAPI/Tests/WebKitCocoa/Challenge.mm:
+ (createTestIdentity):
+ (testIdentity):
+ (testIdentity2):
+ * TestWebKitAPI/Tests/WebKitCocoa/ServiceWorkerBasic.mm:
+ * TestWebKitAPI/cocoa/HTTPServer.h:
+ * TestWebKitAPI/cocoa/HTTPServer.mm:
+ (TestWebKitAPI::HTTPServer::listenerParameters):
+ (TestWebKitAPI::HTTPServer::HTTPServer):
+
2020-07-31 Sihui Liu <[email protected]>
-[WKWebsiteDataStore _renameOrigin:] needs to support IndexedDB renames
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/Challenge.mm (265149 => 265150)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/Challenge.mm 2020-07-31 17:44:19 UTC (rev 265149)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/Challenge.mm 2020-07-31 17:54:46 UTC (rev 265150)
@@ -43,6 +43,7 @@
#import <wtf/Platform.h>
#import <wtf/RetainPtr.h>
#import <wtf/spi/cocoa/SecuritySPI.h>
+#import <wtf/text/Base64.h>
static bool navigationFinished;
@@ -52,9 +53,8 @@
return adoptCF(SecCertificateCreateWithData(nullptr, (__bridge CFDataRef)[NSData dataWithBytes:certificateBytes.data() length:certificateBytes.size()]));
}
-RetainPtr<SecIdentityRef> testIdentity()
+static RetainPtr<SecIdentityRef> createTestIdentity(const Vector<uint8_t>& privateKeyBytes, const Vector<uint8_t>& certificateBytes)
{
- auto privateKeyBytes = TestWebKitAPI::TCPServer::testPrivateKey();
NSData *derEncodedPrivateKey = [NSData dataWithBytes:privateKeyBytes.data() length:privateKeyBytes.size()];
NSDictionary* options = @{
(id)kSecAttrKeyType: (id)kSecAttrKeyTypeRSA,
@@ -67,9 +67,124 @@
EXPECT_NULL(error);
EXPECT_NOT_NULL(privateKey.get());
- return adoptCF(SecIdentityCreate(kCFAllocatorDefault, testCertificate().get(), privateKey.get()));
+ auto testCertificate = adoptCF(SecCertificateCreateWithData(nullptr, (__bridge CFDataRef)[NSData dataWithBytes:certificateBytes.data() length:certificateBytes.size()]));
+
+ return adoptCF(SecIdentityCreate(kCFAllocatorDefault, testCertificate.get(), privateKey.get()));
}
+RetainPtr<SecIdentityRef> testIdentity()
+{
+ return createTestIdentity(TestWebKitAPI::TCPServer::testPrivateKey(), TestWebKitAPI::TCPServer::testCertificate());
+}
+
+RetainPtr<SecIdentityRef> testIdentity2()
+{
+ // Certificate and private key were generated by running this command:
+ // openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -days 365 -nodes
+ // and entering this information:
+ /*
+ Country Name (2 letter code) []:US
+ State or Province Name (full name) []:New Mexico
+ Locality Name (eg, city) []:Santa Fe
+ Organization Name (eg, company) []:Self
+ Organizational Unit Name (eg, section) []:Myself
+ Common Name (eg, fully qualified host name) []:Me
+ Email Address []:[email protected]
+ */
+
+ String pemEncodedPrivateKey(""
+ "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"
+ "hgOy/TdJO/NjmTHBgpITP6lv69QvaV9z");
+
+ String pemEncodedCertificate(""
+ "MIIFgDCCA2gCCQD+QY1JRnM3IjANBgkqhkiG9w0BAQsFADCBgTELMAkGA1UEBhMC"
+ "VVMxEzARBgNVBAgMCk5ldyBNZXhpY28xETAPBgNVBAcMCFNhbnRhIEZlMQ0wCwYD"
+ "VQQKDARTZWxmMQ8wDQYDVQQLDAZNeXNlbGYxCzAJBgNVBAMMAk1lMR0wGwYJKoZI"
+ "hvcNAQkBFg5tZUBleGFtcGxlLmNvbTAeFw0yMDA3MzEwODU2MDZaFw0yMTA3MzEw"
+ "ODU2MDZaMIGBMQswCQYDVQQGEwJVUzETMBEGA1UECAwKTmV3IE1leGljbzERMA8G"
+ "A1UEBwwIU2FudGEgRmUxDTALBgNVBAoMBFNlbGYxDzANBgNVBAsMBk15c2VsZjEL"
+ "MAkGA1UEAwwCTWUxHTAbBgkqhkiG9w0BCQEWDm1lQGV4YW1wbGUuY29tMIICIjAN"
+ "BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAz5ONmkV1MNfOpmQnYZ/UuQM+BzWN"
+ "UJrEuX8/Gw/ec0FZo67QKScuydzYbAO6N5RxOqxc/0lC9iX5wIjJWK33W4Xz//cY"
+ "hIPvRJBK5v4BNiSWvcFikFEc1Vs5sgfzhBwxDCxnY35EAb1g4hswZ6JTGRgL+1wk"
+ "yWDu8haJ2Mj085gzHg22401SUhdsn4LoH9zdoURyMsFYJlLKKsTgKmTaFxpFzDkM"
+ "VDwvCkuietvkG9TRNEHSeqDjciBGoEXWKF2W7K5j8+LNdxdm+0Gi3r75enppSRON"
+ "Ujl0xYTvDzd0JOsOM5h5IvAGMCoWnAETST3O51D5aU0EVuCmmlUjx1NxG6+6srbU"
+ "v1DIlOFqexummb/z3pamAXHdtKWD5C3NQpvSl9R5cGfHKKSoSYGUZ+9pflDK1tDu"
+ "s6SCpVMv3VVZIjn4tQ2eB83bZ8LBb3NiC7/GgG+WxKsrcvVhmavoJlo2ZfyCe666"
+ "Qx9vLySmw16GSpU8CvdTNUDg5TQoYngcO5gCeRHIQtPfqDVxtJdaYreoFVbanKMm"
+ "YryRDN3aEvZyZubHCJVS/oTsEMPjlWPVFi12XhF0uQe9BGbut0NEOC/pasqY5oq9"
+ "j+pn6FO9rsbHGSP+cYQF5TfNUgAJ+2RyKI+e2ZvvKKWegR0vBH4XZ+ONg2qeg0Dw"
+ "YJhiBLmfMIUoJm0CAwEAATANBgkqhkiG9w0BAQsFAAOCAgEAnH5sdBRTyZEiI9bt"
+ "umxSkOsk93V+CxkXl74vm2sjlk3Je3UBFk+QYO9RcbAsM5Olsu8pzAnUJAMhvQZP"
+ "xU2CzFAZdNiL1CYEwPKXC7bGwfVrVoIdLHkIhuHOO/5G/KazwTTNrfigEqAONrnr"
+ "SHSfaWKy6jpJFRMH28llMFK5Ev4USfDhKZXOB0blprX9Rh2NDgahhNKhWlRBO3/g"
+ "L1yW1YOYCMdkV2dOoZEzY4eBG34mCgS72EI8OJYBPVKGtTXD6cPzuf5rW8ueHvEA"
+ "DzeBr5E88UpLvFPGfkKdzSH/KOUXUWLW9lmLVPXrL5Jfvc1taVXhveUNIR2vn/ID"
+ "LPxlSBKD44Wi989MdehZbI7//rP9S8eZZPKotUUx89epjCRsjmkGcNsjQenTV5B9"
+ "lyrsbh99vifR8WsZp5F1aEcmPdWMMZM5pZLPk+ODvTcdqnbcUH4mKVgyq8CM9tiY"
+ "46izhou3GSKz3X1eYpYbZHF52dxmOUdvpSoqfmlMF1Egv94crD1xh9asdjg2DnXc"
+ "948YxPaFjoOGd6Ync+fv9pJzjTjximbIiWm2r6yt2j9hAuKJXpNOIa4oIMAIGjCi"
+ "JAH2nxKGuqtAK2hWbACu61RT5gAqAv/hB9JYnc2OiQ2VmjYkOk2GEdIjn0xSgX7W"
+ "mI/hHbxKMG3Rkv9q1Cx+WB/v1t8=");
+
+ Vector<uint8_t> privateKeyBytes;
+ base64Decode(pemEncodedPrivateKey, privateKeyBytes, WTF::Base64DecodeOptions::Base64Default);
+
+ Vector<uint8_t> certificateBytes;
+ base64Decode(pemEncodedCertificate, certificateBytes, WTF::Base64DecodeOptions::Base64Default);
+
+ return createTestIdentity(privateKeyBytes, certificateBytes);
+}
+
static RetainPtr<NSURLCredential> credentialWithIdentity()
{
auto identity = testIdentity();
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/ServiceWorkerBasic.mm (265149 => 265150)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/ServiceWorkerBasic.mm 2020-07-31 17:44:19 UTC (rev 265149)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/ServiceWorkerBasic.mm 2020-07-31 17:54:46 UTC (rev 265150)
@@ -2223,4 +2223,77 @@
runTest(ResponseType::Fetched);
}
+TEST(ServiceWorkers, ChangeOfServerCertificate)
+{
+ __block bool removedAnyExistingData = false;
+ [[WKWebsiteDataStore defaultDataStore] removeDataOfTypes:[WKWebsiteDataStore allWebsiteDataTypes] modifiedSince:[NSDate distantPast] completionHandler:^() {
+ removedAnyExistingData = true;
+ }];
+ TestWebKitAPI::Util::run(&removedAnyExistingData);
+
+ static const char* main =
+ "<script>"
+ "async function test() {"
+ " try {"
+ " const registration = await navigator.serviceWorker.register('/sw.js');"
+ " if (registration.active) {"
+ " registration._onupdatefound_ = () => alert('new worker');"
+ " setTimeout(() => alert('no update found'), 5000);"
+ " return;"
+ " }"
+ " worker = registration.installing;"
+ " worker.addEventListener('statechange', () => {"
+ " if (worker.state == 'activated')"
+ " alert('successfully registered');"
+ " });"
+ " } catch(e) {"
+ " alert('Exception: ' + e);"
+ " }"
+ "}"
+ "window._onload_ = test;"
+ "</script>";
+ static const char* js = "";
+
+ auto delegate = adoptNS([TestNavigationDelegate new]);
+ [delegate setDidReceiveAuthenticationChallenge:^(WKWebView *, NSURLAuthenticationChallenge *challenge, void (^callback)(NSURLSessionAuthChallengeDisposition, NSURLCredential *)) {
+ EXPECT_WK_STREQ(challenge.protectionSpace.authenticationMethod, NSURLAuthenticationMethodServerTrust);
+ callback(NSURLSessionAuthChallengeUseCredential, [NSURLCredential credentialForTrust:challenge.protectionSpace.serverTrust]);
+ }];
+
+ auto configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
+ auto webView1 = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600) configuration:configuration.get()]);
+ auto webView2 = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600) configuration:configuration.get()]);
+
+ webView1.get().navigationDelegate = delegate.get();
+ webView2.get().navigationDelegate = delegate.get();
+
+ uint16_t serverPort;
+
+ // Load webView1 with a first server.
+ {
+ TestWebKitAPI::HTTPServer server1({
+ { "/", { main } },
+ { "/sw.js", { {{ "Content-Type", "application/_javascript_" }}, js } }
+ }, TestWebKitAPI::HTTPServer::Protocol::Https, nullptr, testIdentity());
+ serverPort = server1.port();
+
+ [webView1 loadRequest:server1.request()];
+ EXPECT_WK_STREQ([webView1 _test_waitForAlert], "successfully registered");
+
+ server1.cancel();
+ }
+
+ // Load webView2 with a second server on same port with a different certificate
+ // This should trigger installing a new worker.
+ {
+ TestWebKitAPI::HTTPServer server2({
+ { "/", { main } },
+ { "/sw.js", { {{ "Content-Type", "application/_javascript_" }}, js } }
+ }, TestWebKitAPI::HTTPServer::Protocol::Https, nullptr, testIdentity2(), serverPort);
+
+ [webView2 loadRequest:server2.request()];
+ EXPECT_WK_STREQ([webView2 _test_waitForAlert], "new worker");
+ }
+}
+
#endif // HAVE(NETWORK_FRAMEWORK) && HAVE(TLS_PROTOCOL_VERSION_T)
Modified: trunk/Tools/TestWebKitAPI/cocoa/HTTPServer.h (265149 => 265150)
--- trunk/Tools/TestWebKitAPI/cocoa/HTTPServer.h 2020-07-31 17:44:19 UTC (rev 265149)
+++ trunk/Tools/TestWebKitAPI/cocoa/HTTPServer.h 2020-07-31 17:54:46 UTC (rev 265150)
@@ -46,7 +46,7 @@
enum class Protocol : uint8_t { Http, Https, HttpsWithLegacyTLS, Http2 };
using CertificateVerifier = Function<void(sec_protocol_metadata_t, sec_trust_t, sec_protocol_verify_complete_t)>;
- HTTPServer(std::initializer_list<std::pair<String, HTTPResponse>>, Protocol = Protocol::Http, CertificateVerifier&& = nullptr);
+ HTTPServer(std::initializer_list<std::pair<String, HTTPResponse>>, Protocol = Protocol::Http, CertificateVerifier&& = nullptr, RetainPtr<SecIdentityRef>&& = nullptr, Optional<uint16_t> port = { });
HTTPServer(Function<void(Connection)>&&, Protocol = Protocol::Http);
~HTTPServer();
uint16_t port() const;
@@ -57,7 +57,7 @@
static void respondWithChallengeThenOK(Connection);
private:
- static RetainPtr<nw_parameters_t> listenerParameters(Protocol, CertificateVerifier&&);
+ static RetainPtr<nw_parameters_t> listenerParameters(Protocol, CertificateVerifier&&, RetainPtr<SecIdentityRef>&&, Optional<uint16_t> port);
static void respondToRequests(Connection, Ref<RequestData>);
Ref<RequestData> m_requestData;
@@ -170,3 +170,4 @@
#endif // HAVE(NETWORK_FRAMEWORK)
RetainPtr<SecIdentityRef> testIdentity();
+RetainPtr<SecIdentityRef> testIdentity2();
Modified: trunk/Tools/TestWebKitAPI/cocoa/HTTPServer.mm (265149 => 265150)
--- trunk/Tools/TestWebKitAPI/cocoa/HTTPServer.mm 2020-07-31 17:44:19 UTC (rev 265149)
+++ trunk/Tools/TestWebKitAPI/cocoa/HTTPServer.mm 2020-07-31 17:54:46 UTC (rev 265150)
@@ -52,12 +52,14 @@
Vector<Connection> connections;
};
-RetainPtr<nw_parameters_t> HTTPServer::listenerParameters(Protocol protocol, CertificateVerifier&& verifier)
+RetainPtr<nw_parameters_t> HTTPServer::listenerParameters(Protocol protocol, CertificateVerifier&& verifier, RetainPtr<SecIdentityRef>&& customTestIdentity, Optional<uint16_t> port)
{
- auto configureTLS = protocol == Protocol::Http ? makeBlockPtr(NW_PARAMETERS_DISABLE_PROTOCOL) : makeBlockPtr([protocol, verifier = WTFMove(verifier)] (nw_protocol_options_t protocolOptions) mutable {
+ if (protocol != Protocol::Http && !customTestIdentity)
+ customTestIdentity = testIdentity();
+ auto configureTLS = protocol == Protocol::Http ? makeBlockPtr(NW_PARAMETERS_DISABLE_PROTOCOL) : makeBlockPtr([protocol, verifier = WTFMove(verifier), testIdentity = WTFMove(customTestIdentity)] (nw_protocol_options_t protocolOptions) mutable {
#if HAVE(TLS_PROTOCOL_VERSION_T)
auto options = adoptNS(nw_tls_copy_sec_protocol_options(protocolOptions));
- auto identity = adoptNS(sec_identity_create(testIdentity().get()));
+ auto identity = adoptNS(sec_identity_create(testIdentity.get()));
sec_protocol_options_set_local_identity(options.get(), identity.get());
if (protocol == Protocol::HttpsWithLegacyTLS)
sec_protocol_options_set_max_tls_protocol_version(options.get(), tls_protocol_version_TLSv10);
@@ -74,7 +76,10 @@
ASSERT_UNUSED(protocol, protocol != Protocol::HttpsWithLegacyTLS);
#endif
});
- return adoptNS(nw_parameters_create_secure_tcp(configureTLS.get(), NW_PARAMETERS_DEFAULT_CONFIGURATION));
+ auto parameters = adoptNS(nw_parameters_create_secure_tcp(configureTLS.get(), NW_PARAMETERS_DEFAULT_CONFIGURATION));
+ if (port)
+ nw_parameters_set_local_endpoint(parameters.get(), nw_endpoint_create_host("::", makeString(*port).utf8().data()));
+ return parameters;
}
static void startListening(nw_listener_t listener)
@@ -104,9 +109,9 @@
connection.cancel();
}
-HTTPServer::HTTPServer(std::initializer_list<std::pair<String, HTTPResponse>> responses, Protocol protocol, CertificateVerifier&& verifier)
+HTTPServer::HTTPServer(std::initializer_list<std::pair<String, HTTPResponse>> responses, Protocol protocol, CertificateVerifier&& verifier, RetainPtr<SecIdentityRef>&& identity, Optional<uint16_t> port)
: m_requestData(adoptRef(*new RequestData(responses)))
- , m_listener(adoptNS(nw_listener_create(listenerParameters(protocol, WTFMove(verifier)).get())))
+ , m_listener(adoptNS(nw_listener_create(listenerParameters(protocol, WTFMove(verifier), WTFMove(identity), port).get())))
, m_protocol(protocol)
{
nw_listener_set_queue(m_listener.get(), dispatch_get_main_queue());
@@ -121,7 +126,7 @@
HTTPServer::HTTPServer(Function<void(Connection)>&& connectionHandler, Protocol protocol)
: m_requestData(adoptRef(*new RequestData({ })))
- , m_listener(adoptNS(nw_listener_create(listenerParameters(protocol, nullptr).get())))
+ , m_listener(adoptNS(nw_listener_create(listenerParameters(protocol, nullptr, nullptr, { }).get())))
, m_protocol(protocol)
{
nw_listener_set_queue(m_listener.get(), dispatch_get_main_queue());