Security-59306.61.1.tar.gz

[apple/security.git] / OSX / libsecurityd / lib / transition.cpp

diff --git a/OSX/libsecurityd/lib/transition.cpp b/OSX/libsecurityd/lib/transition.cpp
index b34fa376713f0634ebf89b4bfb5f4a65cfbca5b8..5c242e742078213009641610f183d10e989bb280 100644 (file)
--- a/OSX/libsecurityd/lib/transition.cpp
+++ b/OSX/libsecurityd/lib/transition.cpp
@@ -50,6 +50,7 @@
 #include "sstransit.h"
 #include <security_cdsa_client/cspclient.h>
 
 #include "sstransit.h"
 #include <security_cdsa_client/cspclient.h>
 

+#include <CommonCrypto/CommonRandom.h>

 #include <securityd_client/xdr_auth.h>
 #include <securityd_client/xdr_cssm.h>
 #include <securityd_client/xdr_dldb.h>
 #include <securityd_client/xdr_auth.h>
 #include <securityd_client/xdr_cssm.h>
 #include <securityd_client/xdr_dldb.h>


@@ -265,14 +266,23 @@ DbHandle ClientSession::createDb(const DLDbIdentifier &dbId,
        return db;
 }
 
        return db;
 }
 

+DbHandle ClientSession::cloneDb(const DLDbIdentifier &newDbId, DbHandle srcDb) {
+    DataWalkers::DLDbFlatIdentifier ident(newDbId);
+    CopyIn id(&ident, reinterpret_cast<xdrproc_t>(xdr_DLDbFlatIdentifier));
+
+    DbHandle db;
+    IPC(ucsp_client_cloneDb(UCSP_ARGS, srcDb, id.data(), id.length(), &db));
+    return db;
+}
+

 DbHandle ClientSession::recodeDbForSync(DbHandle dbToClone, 
                                                                           DbHandle srcDb)
 {
        DbHandle newDb;
     
        IPC(ucsp_client_recodeDbForSync(UCSP_ARGS, dbToClone, srcDb, &newDb));
 DbHandle ClientSession::recodeDbForSync(DbHandle dbToClone, 
                                                                           DbHandle srcDb)
 {
        DbHandle newDb;
     
        IPC(ucsp_client_recodeDbForSync(UCSP_ARGS, dbToClone, srcDb, &newDb));

-    
-       return newDb;
+
+    return newDb;

 }
 
 DbHandle ClientSession::recodeDbToVersion(uint32 newVersion, DbHandle srcDb)
 }
 
 DbHandle ClientSession::recodeDbToVersion(uint32 newVersion, DbHandle srcDb)


@@ -284,6 +294,11 @@ DbHandle ClientSession::recodeDbToVersion(uint32 newVersion, DbHandle srcDb)
     return newDb;
 }
 
     return newDb;
 }
 

+void ClientSession::recodeFinished(DbHandle db)
+{
+    IPC(ucsp_client_recodeFinished(UCSP_ARGS, db));
+}
+

 DbHandle ClientSession::authenticateDbsForSync(const CssmData &dbHandleArray,
                                                                                           const CssmData &agentData)
 {
 DbHandle ClientSession::authenticateDbsForSync(const CssmData &dbHandleArray,
                                                                                           const CssmData &agentData)
 {


@@ -467,12 +482,18 @@ uint32 ClientSession::getOutputSize(const Context &context, KeyHandle key,
 // a PRNG in its CSP. If you need a reproducible PRNG, attach a local CSP and use it.
 // Note that this function does not allocate a buffer; it always fills the buffer provided.
 //
 // a PRNG in its CSP. If you need a reproducible PRNG, attach a local CSP and use it.
 // Note that this function does not allocate a buffer; it always fills the buffer provided.
 //

+// As of macOS 10.15 this no longer fetches random data from the daemon but generates it in-process
+//

 void ClientSession::generateRandom(const Security::Context &context, CssmData &data, Allocator &alloc)
 {
 void ClientSession::generateRandom(const Security::Context &context, CssmData &data, Allocator &alloc)
 {

-       CopyIn ctxcopy(&context, reinterpret_cast<xdrproc_t>(xdr_CSSM_CONTEXT));
-       DataOutput result(data, alloc);
-    
-       IPC(ucsp_client_generateRandom(UCSP_ARGS, 0, ctxcopy.data(), ctxcopy.length(), DATA_OUT(result)));
+    size_t count = context.getInt(CSSM_ATTRIBUTE_OUTPUT_SIZE);
+    if (data.length() < count) {
+        CssmError::throwMe(CSSM_ERRCODE_INVALID_DATA);
+    }
+    CCRNGStatus status = CCRandomGenerateBytes(data.data(), count);
+    if (status != kCCSuccess) {
+        CssmError::throwMe(status);
+    }

 }
 
 
 }
 
 


@@ -813,137 +834,6 @@ void ClientSession::extractMasterKey(DbHandle db, const Context &context, DbHand
 }
 
 
 }
 
 

-//
-// Authorization subsystem entry
-//
-void ClientSession::authCreate(const AuthorizationItemSet *rights,
-       const AuthorizationItemSet *environment, AuthorizationFlags flags,
-       AuthorizationBlob &result)
-{
-       void *rightSet = NULL; mach_msg_size_t rightSet_size = 0;
-       void *environ = NULL; mach_msg_size_t environ_size = 0;
-
-       if ((rights && 
-               !copyin_AuthorizationItemSet(rights, &rightSet, &rightSet_size)) ||
-               (environment && 
-               !copyin_AuthorizationItemSet(environment, &environ, &environ_size)))
-                       CssmError::throwMe(errAuthorizationInternal);
-
-       activate();
-       IPCSTART(ucsp_client_authorizationCreate(UCSP_ARGS,
-               rightSet, rightSet_size, 
-               flags,
-               environ, environ_size, 
-               &result));
-       
-       free(rightSet);
-       free(environ);
-       
-       if (rcode == CSSMERR_CSSM_NO_USER_INTERACTION)
-         CssmError::throwMe(errAuthorizationInteractionNotAllowed);
-       IPCEND_CHECK;
-}
-
-void ClientSession::authRelease(const AuthorizationBlob &auth, 
-       AuthorizationFlags flags)
-{
-       activate();
-       IPCSTART(ucsp_client_authorizationRelease(UCSP_ARGS, auth, flags));
-       if (rcode == CSSMERR_CSSM_NO_USER_INTERACTION)
-         CssmError::throwMe(errAuthorizationInteractionNotAllowed);
-       IPCEND_CHECK;
-}
-
-void ClientSession::authCopyRights(const AuthorizationBlob &auth,
-       const AuthorizationItemSet *rights, const AuthorizationItemSet *environment,
-       AuthorizationFlags flags,
-       AuthorizationItemSet **grantedRights)
-{
-       void *rightSet = NULL; mach_msg_size_t rightSet_size = 0;
-       void *environ = NULL; mach_msg_size_t environ_size = 0;
-       void *result = NULL; mach_msg_type_number_t resultLength = 0;
-       
-       if ((rights && !copyin_AuthorizationItemSet(rights, &rightSet, &rightSet_size)) ||
-               (environment && !copyin_AuthorizationItemSet(environment, &environ, &environ_size)))
-          CssmError::throwMe(errAuthorizationInternal); // allocation error probably
-
-       activate();
-       IPCSTART(ucsp_client_authorizationCopyRights(UCSP_ARGS,
-               auth,
-               rightSet, rightSet_size, 
-               flags | (grantedRights ? 0 : kAuthorizationFlagNoData),
-               environ, environ_size, 
-               &result, &resultLength));
-               
-       free(rightSet);
-       free(environ);
-       
-       // XXX/cs return error when copyout returns false
-       if (rcode == CSSM_OK && grantedRights) 
-               copyout_AuthorizationItemSet(result, resultLength, grantedRights);
-       
-       if (result)
-               mig_deallocate(reinterpret_cast<vm_address_t>(result), resultLength);
-       if (rcode == CSSMERR_CSSM_NO_USER_INTERACTION)
-         CssmError::throwMe(errAuthorizationInteractionNotAllowed);
-       IPCEND_CHECK;
-}
-
-void ClientSession::authCopyInfo(const AuthorizationBlob &auth,
-       const char *tag,
-       AuthorizationItemSet * &info)
-{
-    if (tag == NULL)
-        tag = "";
-    else if (tag[0] == '\0')
-        MacOSError::throwMe(errAuthorizationInvalidTag);
-               
-       activate();
-       void *result; mach_msg_type_number_t resultLength;
-       IPCSTART(ucsp_client_authorizationCopyInfo(UCSP_ARGS, auth, tag, &result, &resultLength));
-
-       // XXX/cs return error when copyout returns false
-       if (rcode == CSSM_OK)
-               copyout_AuthorizationItemSet(result, resultLength, &info);
-       
-       if (result)
-               mig_deallocate(reinterpret_cast<vm_address_t>(result), resultLength);
-
-       if (rcode == CSSMERR_CSSM_NO_USER_INTERACTION)
-         CssmError::throwMe(errAuthorizationInteractionNotAllowed);
-       IPCEND_CHECK;
-}
-
-void ClientSession::authExternalize(const AuthorizationBlob &auth,
-       AuthorizationExternalForm &extForm)
-{
-       activate();
-       IPCSTART(ucsp_client_authorizationExternalize(UCSP_ARGS, auth, &extForm));
-       if (rcode == CSSMERR_CSSM_NO_USER_INTERACTION)
-         CssmError::throwMe(errAuthorizationInteractionNotAllowed);
-       IPCEND_CHECK;
-}
-
-void ClientSession::authInternalize(const AuthorizationExternalForm &extForm,
-       AuthorizationBlob &auth)
-{
-       activate();
-       IPCSTART(ucsp_client_authorizationInternalize(UCSP_ARGS, extForm, &auth));
-       if (rcode == CSSMERR_CSSM_NO_USER_INTERACTION)
-         CssmError::throwMe(errAuthorizationInteractionNotAllowed);
-       IPCEND_CHECK;
-}
-
-
-//
-// Push user preferences from an app in user space to securityd
-//
-void ClientSession::setSessionUserPrefs(SecuritySessionId sessionId, uint32_t userPreferencesLength, const void *userPreferences)
-{
-       IPC(ucsp_client_setSessionUserPrefs(UCSP_ARGS, sessionId, const_cast<void *>(userPreferences), userPreferencesLength));
-}
-
-

 void ClientSession::postNotification(NotificationDomain domain, NotificationEvent event, const CssmData &data)
 {
        uint32 seq = ++mGlobal().thread().notifySeq;
 void ClientSession::postNotification(NotificationDomain domain, NotificationEvent event, const CssmData &data)
 {
        uint32 seq = ++mGlobal().thread().notifySeq;


@@ -951,102 +841,23 @@ void ClientSession::postNotification(NotificationDomain domain, NotificationEven
        if (getenv("NOTIFYJITTER")) {
                // artificially reverse odd/even sequences to test securityd's jitter buffer
                seq += 2 * (seq % 2) - 1;
        if (getenv("NOTIFYJITTER")) {
                // artificially reverse odd/even sequences to test securityd's jitter buffer
                seq += 2 * (seq % 2) - 1;

-               secdebug("notify", "POSTING FAKE SEQUENCE %d NOTIFICATION", seq);
+               secinfo("notify", "POSTING FAKE SEQUENCE %d NOTIFICATION", seq);

        }
 #endif //NDEBUG
        }
 #endif //NDEBUG

-       secdebug("notify", "posting domain 0x%x event %d sequence %d",
+       secinfo("notify", "posting domain 0x%x event %d sequence %d",

                domain, event, seq);
        IPC(ucsp_client_postNotification(UCSP_ARGS, domain, event, DATA(data), seq));
 }
 
                domain, event, seq);
        IPC(ucsp_client_postNotification(UCSP_ARGS, domain, event, DATA(data), seq));
 }
 

-//
-// authorizationdbGet/Set/Remove
-//
-void ClientSession::authorizationdbGet(const AuthorizationString rightname, CssmData &rightDefinition, Allocator &alloc)
-{
-       DataOutput definition(rightDefinition, alloc);
-       activate();
-       IPCSTART(ucsp_client_authorizationdbGet(UCSP_ARGS, rightname, DATA_OUT(definition)));
-       if (rcode == CSSMERR_CSSM_NO_USER_INTERACTION)
-         CssmError::throwMe(errAuthorizationInteractionNotAllowed);
-       IPCEND_CHECK;
-}
-
-void ClientSession::authorizationdbSet(const AuthorizationBlob &auth, const AuthorizationString rightname, uint32_t rightDefinitionLength, const void *rightDefinition)
-{
-       // @@@ DATA_IN in transition.cpp is not const void *
-       activate();
-       IPCSTART(ucsp_client_authorizationdbSet(UCSP_ARGS, auth, rightname, const_cast<void *>(rightDefinition), rightDefinitionLength));
-       if (rcode == CSSMERR_CSSM_NO_USER_INTERACTION)
-         CssmError::throwMe(errAuthorizationInteractionNotAllowed);
-       IPCEND_CHECK;
-}
-
-void ClientSession::authorizationdbRemove(const AuthorizationBlob &auth, const AuthorizationString rightname)
-{
-       activate();
-       IPCSTART(ucsp_client_authorizationdbRemove(UCSP_ARGS, auth, rightname));
-       if (rcode == CSSMERR_CSSM_NO_USER_INTERACTION)
-         CssmError::throwMe(errAuthorizationInteractionNotAllowed);
-       IPCEND_CHECK;
-}
-

 
 //
 
 //

-// Code Signing related
+// Testing related

 //
 //

-void ClientSession::registerHosting(mach_port_t hostingPort, SecCSFlags flags)
-{
-       IPC(ucsp_client_registerHosting(UCSP_ARGS, hostingPort, flags));
-}
-
-mach_port_t ClientSession::hostingPort(pid_t pid)
-{
-       mach_port_t result;
-       IPC(ucsp_client_hostingPort(UCSP_ARGS, pid, &result));
-       return result;
-}
-
-SecGuestRef ClientSession::createGuest(SecGuestRef host,
-               uint32_t status, const char *path, const CssmData &cdhash, const CssmData &attributes, SecCSFlags flags)
-{
-       SecGuestRef newGuest;
-       IPC(ucsp_client_createGuest(UCSP_ARGS, host, status, path, DATA(cdhash), DATA(attributes), flags, &newGuest));
-       if (flags & kSecCSDedicatedHost) {
-               secdebug("ssclient", "setting dedicated guest to 0x%x (was 0x%x)",
-                       mDedicatedGuest, newGuest);
-               mDedicatedGuest = newGuest;
-       }
-       return newGuest;
-}
-
-void ClientSession::setGuestStatus(SecGuestRef guest, uint32 status, const CssmData &attributes)
-{
-       IPC(ucsp_client_setGuestStatus(UCSP_ARGS, guest, status, DATA(attributes)));
-}
-
-void ClientSession::removeGuest(SecGuestRef host, SecGuestRef guest)
-{
-       IPC(ucsp_client_removeGuest(UCSP_ARGS, host, guest));
-}

 
 

-void ClientSession::selectGuest(SecGuestRef newGuest)
-{
-       if (mDedicatedGuest) {
-               secdebug("ssclient", "ignoring selectGuest(0x%x) because dedicated guest=0x%x",
-                       newGuest, mDedicatedGuest);
-       } else {
-               secdebug("ssclient", "switching to guest 0x%x", newGuest);
-               mGlobal().thread().currentGuest = newGuest;
-       }
-}
-
-SecGuestRef ClientSession::selectedGuest() const
-{
-       if (mDedicatedGuest)
-               return mDedicatedGuest;
-       else
-               return mGlobal().thread().currentGuest;
+// Return the number of Keychain users prompts securityd has considered showing.
+// On non-internal installs, this returns 0.
+void ClientSession::getUserPromptAttempts(uint32_t& attempts) {
+    IPC(ucsp_client_getUserPromptAttempts(UCSP_ARGS, &attempts));

 }
 
 
 }