Title: [285540] branches/safari-613.1.7-branch/Source
- Revision
- 285540
- Author
- alanc...@apple.com
- Date
- 2021-11-09 16:03:09 -0800 (Tue, 09 Nov 2021)
Log Message
Cherry-pick r285164. rdar://problem/85227922
WebDriver: [Cocoa] support `acceptInsecureCerts` capability
https://bugs.webkit.org/show_bug.cgi?id=231789
Reviewed by BJ Burg.
Add necessary plumbing to support the `acceptInsecureCerts` WebDriver capability.
Source/_javascript_Core:
* inspector/remote/RemoteInspectorConstants.h:
* inspector/remote/cocoa/RemoteInspectorCocoa.mm:
(Inspector::RemoteInspector::receivedAutomationSessionRequestMessage):
Source/WebKit:
* UIProcess/API/Cocoa/_WKAutomationSessionConfiguration.h:
* UIProcess/API/Cocoa/_WKAutomationSessionConfiguration.mm:
(-[_WKAutomationSessionConfiguration init]):
(-[_WKAutomationSessionConfiguration copyWithZone:]):
* UIProcess/Cocoa/AutomationClient.mm:
(WebKit::AutomationClient::requestAutomationSession):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@285164 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-613.1.7-branch/Source/_javascript_Core/ChangeLog (285539 => 285540)
--- branches/safari-613.1.7-branch/Source/_javascript_Core/ChangeLog 2021-11-09 23:53:08 UTC (rev 285539)
+++ branches/safari-613.1.7-branch/Source/_javascript_Core/ChangeLog 2021-11-10 00:03:09 UTC (rev 285540)
@@ -1,3 +1,45 @@
+2021-11-09 Alan Coon <alanc...@apple.com>
+
+ Cherry-pick r285164. rdar://problem/85227922
+
+ WebDriver: [Cocoa] support `acceptInsecureCerts` capability
+ https://bugs.webkit.org/show_bug.cgi?id=231789
+
+ Reviewed by BJ Burg.
+
+ Add necessary plumbing to support the `acceptInsecureCerts` WebDriver capability.
+
+ Source/_javascript_Core:
+
+ * inspector/remote/RemoteInspectorConstants.h:
+ * inspector/remote/cocoa/RemoteInspectorCocoa.mm:
+ (Inspector::RemoteInspector::receivedAutomationSessionRequestMessage):
+
+ Source/WebKit:
+
+ * UIProcess/API/Cocoa/_WKAutomationSessionConfiguration.h:
+ * UIProcess/API/Cocoa/_WKAutomationSessionConfiguration.mm:
+ (-[_WKAutomationSessionConfiguration init]):
+ (-[_WKAutomationSessionConfiguration copyWithZone:]):
+ * UIProcess/Cocoa/AutomationClient.mm:
+ (WebKit::AutomationClient::requestAutomationSession):
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@285164 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-11-02 Patrick Angle <pan...@apple.com>
+
+ WebDriver: [Cocoa] support `acceptInsecureCerts` capability
+ https://bugs.webkit.org/show_bug.cgi?id=231789
+
+ Reviewed by BJ Burg.
+
+ Add necessary plumbing to support the `acceptInsecureCerts` WebDriver capability.
+
+ * inspector/remote/RemoteInspectorConstants.h:
+ * inspector/remote/cocoa/RemoteInspectorCocoa.mm:
+ (Inspector::RemoteInspector::receivedAutomationSessionRequestMessage):
+
2021-10-31 Cameron McCormack <hey...@apple.com>
Update Web IDL links to new URL
Modified: branches/safari-613.1.7-branch/Source/_javascript_Core/inspector/remote/RemoteInspectorConstants.h (285539 => 285540)
--- branches/safari-613.1.7-branch/Source/_javascript_Core/inspector/remote/RemoteInspectorConstants.h 2021-11-09 23:53:08 UTC (rev 285539)
+++ branches/safari-613.1.7-branch/Source/_javascript_Core/inspector/remote/RemoteInspectorConstants.h 2021-11-10 00:03:09 UTC (rev 285540)
@@ -103,6 +103,7 @@
// The value for WIRSessionCapabilitiesKey is a dictionary that holds these capability key-value pairs.
+#define WIRAcceptInsecureCertificatesKey @"org.webkit.webdriver.accept-insecure-certificates"
#define WIRAllowInsecureMediaCaptureCapabilityKey @"org.webkit.webdriver.webrtc.allow-insecure-media-capture"
#define WIRSuppressICECandidateFilteringCapabilityKey @"org.webkit.webdriver.webrtc.suppress-ice-candidate-filtering"
Modified: branches/safari-613.1.7-branch/Source/_javascript_Core/inspector/remote/cocoa/RemoteInspectorCocoa.mm (285539 => 285540)
--- branches/safari-613.1.7-branch/Source/_javascript_Core/inspector/remote/cocoa/RemoteInspectorCocoa.mm 2021-11-09 23:53:08 UTC (rev 285539)
+++ branches/safari-613.1.7-branch/Source/_javascript_Core/inspector/remote/cocoa/RemoteInspectorCocoa.mm 2021-11-10 00:03:09 UTC (rev 285540)
@@ -729,6 +729,11 @@
BAIL_IF_UNEXPECTED_TYPE_ALLOWING_NIL(forwardedCapabilities, [NSDictionary class]);
Client::SessionCapabilities sessionCapabilities;
+ if (NSNumber *value = forwardedCapabilities[WIRAcceptInsecureCertificatesKey]) {
+ if ([value isKindOfClass:[NSNumber class]])
+ sessionCapabilities.acceptInsecureCertificates = value.boolValue;
+ }
+
if (NSNumber *value = forwardedCapabilities[WIRAllowInsecureMediaCaptureCapabilityKey]) {
if ([value isKindOfClass:[NSNumber class]])
sessionCapabilities.allowInsecureMediaCapture = value.boolValue;
Modified: branches/safari-613.1.7-branch/Source/WebKit/ChangeLog (285539 => 285540)
--- branches/safari-613.1.7-branch/Source/WebKit/ChangeLog 2021-11-09 23:53:08 UTC (rev 285539)
+++ branches/safari-613.1.7-branch/Source/WebKit/ChangeLog 2021-11-10 00:03:09 UTC (rev 285540)
@@ -1,3 +1,48 @@
+2021-11-09 Alan Coon <alanc...@apple.com>
+
+ Cherry-pick r285164. rdar://problem/85227922
+
+ WebDriver: [Cocoa] support `acceptInsecureCerts` capability
+ https://bugs.webkit.org/show_bug.cgi?id=231789
+
+ Reviewed by BJ Burg.
+
+ Add necessary plumbing to support the `acceptInsecureCerts` WebDriver capability.
+
+ Source/_javascript_Core:
+
+ * inspector/remote/RemoteInspectorConstants.h:
+ * inspector/remote/cocoa/RemoteInspectorCocoa.mm:
+ (Inspector::RemoteInspector::receivedAutomationSessionRequestMessage):
+
+ Source/WebKit:
+
+ * UIProcess/API/Cocoa/_WKAutomationSessionConfiguration.h:
+ * UIProcess/API/Cocoa/_WKAutomationSessionConfiguration.mm:
+ (-[_WKAutomationSessionConfiguration init]):
+ (-[_WKAutomationSessionConfiguration copyWithZone:]):
+ * UIProcess/Cocoa/AutomationClient.mm:
+ (WebKit::AutomationClient::requestAutomationSession):
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@285164 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-11-02 Patrick Angle <pan...@apple.com>
+
+ WebDriver: [Cocoa] support `acceptInsecureCerts` capability
+ https://bugs.webkit.org/show_bug.cgi?id=231789
+
+ Reviewed by BJ Burg.
+
+ Add necessary plumbing to support the `acceptInsecureCerts` WebDriver capability.
+
+ * UIProcess/API/Cocoa/_WKAutomationSessionConfiguration.h:
+ * UIProcess/API/Cocoa/_WKAutomationSessionConfiguration.mm:
+ (-[_WKAutomationSessionConfiguration init]):
+ (-[_WKAutomationSessionConfiguration copyWithZone:]):
+ * UIProcess/Cocoa/AutomationClient.mm:
+ (WebKit::AutomationClient::requestAutomationSession):
+
2021-11-03 Alan Coon <alanc...@apple.com>
Cherry-pick r285110. rdar://problem/84994696
Modified: branches/safari-613.1.7-branch/Source/WebKit/UIProcess/API/Cocoa/_WKAutomationSessionConfiguration.h (285539 => 285540)
--- branches/safari-613.1.7-branch/Source/WebKit/UIProcess/API/Cocoa/_WKAutomationSessionConfiguration.h 2021-11-09 23:53:08 UTC (rev 285539)
+++ branches/safari-613.1.7-branch/Source/WebKit/UIProcess/API/Cocoa/_WKAutomationSessionConfiguration.h 2021-11-10 00:03:09 UTC (rev 285540)
@@ -32,6 +32,7 @@
WK_CLASS_AVAILABLE(macos(10.13.4), ios(12.2))
@interface _WKAutomationSessionConfiguration : NSObject <NSCopying>
+@property (nonatomic) BOOL acceptInsecureCertificates;
@property (nonatomic) BOOL allowsInsecureMediaCapture;
@property (nonatomic) BOOL suppressesICECandidateFiltering;
Modified: branches/safari-613.1.7-branch/Source/WebKit/UIProcess/API/Cocoa/_WKAutomationSessionConfiguration.mm (285539 => 285540)
--- branches/safari-613.1.7-branch/Source/WebKit/UIProcess/API/Cocoa/_WKAutomationSessionConfiguration.mm 2021-11-09 23:53:08 UTC (rev 285539)
+++ branches/safari-613.1.7-branch/Source/WebKit/UIProcess/API/Cocoa/_WKAutomationSessionConfiguration.mm 2021-11-10 00:03:09 UTC (rev 285540)
@@ -33,6 +33,7 @@
if (!(self = [super init]))
return nil;
+ _acceptInsecureCertificates = NO;
_allowsInsecureMediaCapture = YES;
_suppressesICECandidateFiltering = NO;
@@ -43,6 +44,7 @@
{
_WKAutomationSessionConfiguration *configuration = [(_WKAutomationSessionConfiguration *)[[self class] allocWithZone:zone] init];
+ configuration.acceptInsecureCertificates = self.acceptInsecureCertificates;
configuration.allowsInsecureMediaCapture = self.allowsInsecureMediaCapture;
configuration.suppressesICECandidateFiltering = self.suppressesICECandidateFiltering;
Modified: branches/safari-613.1.7-branch/Source/WebKit/UIProcess/Cocoa/AutomationClient.mm (285539 => 285540)
--- branches/safari-613.1.7-branch/Source/WebKit/UIProcess/Cocoa/AutomationClient.mm 2021-11-09 23:53:08 UTC (rev 285539)
+++ branches/safari-613.1.7-branch/Source/WebKit/UIProcess/Cocoa/AutomationClient.mm 2021-11-10 00:03:09 UTC (rev 285540)
@@ -78,6 +78,8 @@
void AutomationClient::requestAutomationSession(const String& sessionIdentifier, const RemoteInspector::Client::SessionCapabilities& sessionCapabilities)
{
auto configuration = adoptNS([[_WKAutomationSessionConfiguration alloc] init]);
+ [configuration setAcceptInsecureCertificates:sessionCapabilities.acceptInsecureCertificates];
+
if (sessionCapabilities.allowInsecureMediaCapture)
[configuration setAllowsInsecureMediaCapture:sessionCapabilities.allowInsecureMediaCapture.value()];
if (sessionCapabilities.suppressICECandidateFiltering)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
