Unreviewed, rolling out r239524.

https://bugs.webkit.org/show_bug.cgi?id=193083 basic browsing seems not to work (Requested by thorton on #webkit). Reverted changeset: "Expand use of sourceApplicationAuditData" https://bugs.webkit.org/show_bug.cgi?id=192995 https://trac.webkit.org/changeset/239524 Canonical link: https://commits.webkit.org/207603@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@239572 268f45cc-cd09-0410-ab3c-d52691b4dbfc
WebKit · Jan 2, 2019 · a6c45de · a6c45de
1 parent e21bcc8
commit a6c45de
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 23 deletions.
diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
@@ -1,3 +1,17 @@
+2019-01-02  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r239524.
+        https://bugs.webkit.org/show_bug.cgi?id=193083
+
+        basic browsing seems not to work (Requested by thorton on
+        #webkit).
+
+        Reverted changeset:
+
+        "Expand use of sourceApplicationAuditData"
+        https://bugs.webkit.org/show_bug.cgi?id=192995
+        https://trac.webkit.org/changeset/239524
+
 2018-12-28  Yusuke Suzuki  <yusukesuzuki@slowstart.org>
 
         Add ENABLE_UNIFIED_BUILDS option to cmake ports

diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
@@ -1359,10 +1359,6 @@
 #define HAVE_RSA_PSS 1
 #endif
 
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500) || PLATFORM(IOS_FAMILY)
-#define USE_SOURCE_APPLICATION_AUDIT_DATA 1
-#endif
-
 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400) || PLATFORM(IOS) || PLATFORM(IOSMAC)
 #define HAVE_URL_FORMATTING 1
 #endif

diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
@@ -1,3 +1,17 @@
+2019-01-02  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r239524.
+        https://bugs.webkit.org/show_bug.cgi?id=193083
+
+        basic browsing seems not to work (Requested by thorton on
+        #webkit).
+
+        Reverted changeset:
+
+        "Expand use of sourceApplicationAuditData"
+        https://bugs.webkit.org/show_bug.cgi?id=192995
+        https://trac.webkit.org/changeset/239524
+
 2019-01-01  Jeff Miller  <jeffm@apple.com>
 
         Update user-visible copyright strings to include 2019

diff --git a/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm b/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm
@@ -133,14 +133,12 @@ static void initializeNetworkSettings()
 
 RetainPtr<CFDataRef> NetworkProcess::sourceApplicationAuditData() const
 {
-#if USE(SOURCE_APPLICATION_AUDIT_DATA)
+#if PLATFORM(IOS_FAMILY) && !PLATFORM(IOSMAC)
+    audit_token_t auditToken;
     ASSERT(parentProcessConnection());
-    if (!parentProcessConnection())
+    if (!parentProcessConnection() || !parentProcessConnection()->getAuditToken(auditToken))
         return nullptr;
-    Optional<audit_token_t> auditToken = parentProcessConnection()->getAuditToken();
-    if (!auditToken)
-        return nullptr;
-    return adoptCF(CFDataCreate(nullptr, (const UInt8*)&*auditToken, sizeof(*auditToken)));
+    return adoptCF(CFDataCreate(nullptr, (const UInt8*)&auditToken, sizeof(auditToken)));
 #else
     return nullptr;
 #endif

diff --git a/Source/WebKit/Platform/IPC/Connection.h b/Source/WebKit/Platform/IPC/Connection.h
@@ -137,7 +137,7 @@ class Connection : public ThreadSafeRefCounted<Connection, WTF::DestructionThrea
     };
     static bool identifierIsValid(Identifier identifier) { return MACH_PORT_VALID(identifier.port); }
     xpc_connection_t xpcConnection() const { return m_xpcConnection.get(); }
-    Optional<audit_token_t> getAuditToken();
+    bool getAuditToken(audit_token_t&);
     pid_t remoteProcessID() const;
 #elif OS(WINDOWS)
     typedef HANDLE Identifier;

diff --git a/Source/WebKit/Platform/IPC/mac/ConnectionMac.mm b/Source/WebKit/Platform/IPC/mac/ConnectionMac.mm
@@ -603,14 +603,13 @@ void watchdogTimerFired()
     return Identifier(m_isServer ? m_receivePort : m_sendPort, m_xpcConnection);
 }
 
-Optional<audit_token_t> Connection::getAuditToken()
+bool Connection::getAuditToken(audit_token_t& auditToken)
 {
     if (!m_xpcConnection)
-        return WTF::nullopt;
+        return false;
 
-    audit_token_t auditToken;
     xpc_connection_get_audit_token(m_xpcConnection.get(), &auditToken);
-    return WTFMove(auditToken);
+    return true;
 }
 
 bool Connection::kill()

diff --git a/Source/WebKit/WebProcess/WebProcess.cpp b/Source/WebKit/WebProcess/WebProcess.cpp
@@ -401,8 +401,9 @@ void WebProcess::initializeWebProcess(WebProcessCreationParameters&& parameters)
 #endif
 
 #if ENABLE(REMOTE_INSPECTOR) && PLATFORM(COCOA)
-    if (Optional<audit_token_t> auditToken = parentProcessConnection()->getAuditToken()) {
-        RetainPtr<CFDataRef> auditData = adoptCF(CFDataCreate(nullptr, (const UInt8*)&*auditToken, sizeof(*auditToken)));
+    audit_token_t auditToken;
+    if (parentProcessConnection()->getAuditToken(auditToken)) {
+        RetainPtr<CFDataRef> auditData = adoptCF(CFDataCreate(nullptr, (const UInt8*)&auditToken, sizeof(auditToken)));
         Inspector::RemoteInspector::singleton().setParentProcessInformation(WebCore::presentingApplicationPID(), auditData);
     }
 #endif

diff --git a/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm b/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm
@@ -417,14 +417,12 @@ static void registerWithAccessibility()
 
 RetainPtr<CFDataRef> WebProcess::sourceApplicationAuditData() const
 {
-#if USE(SOURCE_APPLICATION_AUDIT_DATA)
+#if PLATFORM(IOS_FAMILY)
+    audit_token_t auditToken;
     ASSERT(parentProcessConnection());
-    if (!parentProcessConnection())
-        return nullptr;
-    Optional<audit_token_t> auditToken = parentProcessConnection()->getAuditToken();
-    if (!auditToken)
+    if (!parentProcessConnection() || !parentProcessConnection()->getAuditToken(auditToken))
         return nullptr;
-    return adoptCF(CFDataCreate(nullptr, (const UInt8*)&*auditToken, sizeof(*auditToken)));
+    return adoptCF(CFDataCreate(nullptr, (const UInt8*)&auditToken, sizeof(auditToken)));
 #else
     return nullptr;
 #endif