Changeset 266100 in webkit

Timestamp:

Aug 24, 2020, 8:36:45 PM (6 years ago)

Author:

commit-queue@webkit.org

Message:

Make TLSVersion.DefaultBehavior more robust
​https://bugs.webkit.org/show_bug.cgi?id=215791

Patch by Alex Christensen <​achristensen@webkit.org> on 2020-08-24
Reviewed by Darin Adler.

After r265573 sometimes it would assert, which is not a problem because it was failing the first connection
then succeeding the second connection as intended and as happens in the real internet.
Use HTTPServer which accepts a variable number of connections to keep the test coverage.

• TestWebKitAPI/Tests/WebKitCocoa/TLSDeprecation.mm:

(TestWebKitAPI::TEST):

• TestWebKitAPI/cocoa/HTTPServer.h:
• TestWebKitAPI/cocoa/HTTPServer.mm:

(TestWebKitAPI::HTTPServer::respondWithChallengeThenOK):
(TestWebKitAPI::HTTPServer::respondWithOK):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• TestWebKitAPI/Tests/WebKitCocoa/TLSDeprecation.mm (modified) (2 diffs)
• TestWebKitAPI/cocoa/HTTPServer.h (modified) (1 diff)
• TestWebKitAPI/cocoa/HTTPServer.mm (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2020-08-24  Alex Christensen  <achristensen@webkit.org>
+
+        Make TLSVersion.DefaultBehavior more robust
+        https://bugs.webkit.org/show_bug.cgi?id=215791
+
+        Reviewed by Darin Adler.
+
+        After r265573 sometimes it would assert, which is not a problem because it was failing the first connection
+        then succeeding the second connection as intended and as happens in the real internet.
+        Use HTTPServer which accepts a variable number of connections to keep the test coverage.
+
+        * TestWebKitAPI/Tests/WebKitCocoa/TLSDeprecation.mm:
+        (TestWebKitAPI::TEST):
+        * TestWebKitAPI/cocoa/HTTPServer.h:
+        * TestWebKitAPI/cocoa/HTTPServer.mm:
+        (TestWebKitAPI::HTTPServer::respondWithChallengeThenOK):
+        (TestWebKitAPI::HTTPServer::respondWithOK):
+
 2020-08-24  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/TLSDeprecation.mm

@@ -145 +145 @@
 static NSString *defaultsKey = @"WebKitEnableLegacyTLS";
 
+#if HAVE(NETWORK_FRAMEWORK)
+
 TEST(TLSVersion, DefaultBehavior)
 {
-    TCPServer server(TCPServer::Protocol::HTTPS, TCPServer::respondWithOK, tls1_1);
+    HTTPServer server(HTTPServer::respondWithOK, HTTPServer::Protocol::HttpsWithLegacyTLS);
     auto delegate = adoptNS([TestNavigationDelegate new]);
     auto webView = adoptNS([WKWebView new]);
@@ -158 +160 @@
     [delegate waitForDidFinishNavigation];
 }
+
+#endif // HAVE(NETWORK_FRAMEWORK)
 
 #if HAVE(TLS_VERSION_DURING_CHALLENGE)

trunk/Tools/TestWebKitAPI/cocoa/HTTPServer.h

@@ -55 +55 @@
     void cancel();
 
+    static void respondWithOK(Connection);
     static void respondWithChallengeThenOK(Connection);
-    
+
 private:
     static RetainPtr<nw_parameters_t> listenerParameters(Protocol, CertificateVerifier&&, RetainPtr<SecIdentityRef>&&, Optional<uint16_t> port);

trunk/Tools/TestWebKitAPI/cocoa/HTTPServer.mm

@@ -151 +151 @@
         "WWW-Authenticate: Basic realm=\"testrealm\"\r\n\r\n";
         connection.send(challengeHeader, [connection] {
-            connection.receiveHTTPRequest([connection] (Vector<char>&&) {
-                connection.send(
-                    "HTTP/1.1 200 OK\r\n"
-                    "Content-Length: 13\r\n\r\n"
-                    "Hello, World!"
-                );
-            });
+            respondWithOK(connection);
         });
+    });
+}
+
+void HTTPServer::respondWithOK(Connection connection)
+{
+    connection.receiveHTTPRequest([connection] (Vector<char>&&) {
+        connection.send(
+            "HTTP/1.1 200 OK\r\n"
+            "Content-Length: 13\r\n\r\n"
+            "Hello, World!"
+        );
     });
 }