/*
- * Copyright (c) 2000-2004 Apple Computer, Inc. All Rights Reserved.
+ * Copyright (c) 2000-2009 Apple Inc. All Rights Reserved.
*
* @APPLE_LICENSE_HEADER_START@
*
//
// transition - securityd IPC-to-class-methods transition layer
//
+// This file contains all server-side MIG implementations for the main
+// securityd protocol ("ucsp"). It dispatches them into the vast object
+// conspiracy that is securityd, anchored in the Server object.
+//
+#include <securityd_client/ss_types.h>
#include <securityd_client/ucsp.h>
#include "server.h"
#include "session.h"
+#include "agentquery.h"
#include "database.h"
#include "kcdatabase.h"
#include "tokendatabase.h"
#include "kckey.h"
-#include "transwalkers.h"
#include "child.h"
+#include <syslog.h>
#include <mach/mach_error.h>
+#include <securityd_client/xdr_cssm.h>
+#include <securityd_client/xdr_auth.h>
+#include <securityd_client/xdr_dldb.h>
+#include <security_utilities/logging.h>
+#include <AssertMacros.h>
+#include <CoreFoundation/CFNumber.h>
#include <CoreFoundation/CFDictionary.h>
#include <CoreFoundation/CFPropertyList.h>
-
//
// Bracket Macros
//
-#define UCSP_ARGS mach_port_t servicePort, mach_port_t replyPort, audit_token_t auditToken, \
- CSSM_RETURN *rcode
-#define CONTEXT_ARGS Context context, Pointer contextBase, Context::Attr *attributes, mach_msg_type_number_t attrSize
+#define UCSP_ARGS mach_port_t servicePort, mach_port_t replyPort, \
+ audit_token_t auditToken, CSSM_RETURN *rcode
#define BEGIN_IPCN *rcode = CSSM_OK; try {
-#define BEGIN_IPC BEGIN_IPCN RefPointer<Connection> connRef(&Server::connection(replyPort)); \
-Connection &connection __attribute__((unused)) = *connRef;
-#define END_IPC(base) END_IPCN(base) Server::requestComplete(); return KERN_SUCCESS;
-#define END_IPCN(base) } \
+#define BEGIN_IPC(name) BEGIN_IPCN RefPointer<Connection> connRef(&Server::connection(replyPort, auditToken)); \
+ Connection &connection __attribute__((unused)) = *connRef; \
+ if (SECURITYD_REQUEST_ENTRY_ENABLED()) { \
+ const char * volatile s = #name; volatile char __attribute__((unused)) pagein = s[0]; \
+ SECURITYD_REQUEST_ENTRY((char *)s, &connection, &connection.process()); \
+ }
+#define END_IPC(base) END_IPCN(base) Server::requestComplete(*rcode); return KERN_SUCCESS;
+#define END_IPCN(base) SECURITYD_REQUEST_RETURN(*rcode); \
+ } \
catch (const CommonError &err) { *rcode = CssmError::cssmError(err, CSSM_ ## base ## _BASE_ERROR); } \
catch (const std::bad_alloc &) { *rcode = CssmError::merge(CSSM_ERRCODE_MEMORY_ERROR, CSSM_ ## base ## _BASE_ERROR); } \
catch (Connection *conn) { *rcode = 0; } \
#define BEGIN_IPCS try {
#define END_IPCS(more) } catch (...) { } \
- mach_port_deallocate(mach_task_self(), serverPort); more; return KERN_SUCCESS;
+ mach_port_deallocate(mach_task_self(), servicePort); more; return KERN_SUCCESS;
#define DATA_IN(base) void *base, mach_msg_type_number_t base##Length
#define DATA_OUT(base) void **base, mach_msg_type_number_t *base##Length
#define DATA(base) CssmData(base, base##Length)
-#define OPTDATA(base) (base ? &CssmData(base, base##Length) : NULL)
#define SSBLOB(Type, name) makeBlob<Type>(DATA(name))
-#define COPY_IN(type,name) type *name, mach_msg_type_number_t name##Length, type *name##Base
-#define COPY_OUT(type,name) \
- type **name, mach_msg_type_number_t *name##Length, type **name##Base
-
-
using LowLevelMemoryUtilities::increment;
using LowLevelMemoryUtilities::difference;
+class CopyOutAccessCredentials : public CopyOut {
+public:
+ CopyOutAccessCredentials(void *copy, size_t size) : CopyOut(copy, size + sizeof(CSSM_ACCESS_CREDENTIALS), reinterpret_cast<xdrproc_t>(xdr_CSSM_ACCESS_CREDENTIALS_PTR)) { }
+ operator AccessCredentials *() { return static_cast<AccessCredentials *>(reinterpret_cast<CSSM_ACCESS_CREDENTIALS_PTR>(data())); }
+};
+
+
+class CopyOutEntryAcl : public CopyOut {
+public:
+ CopyOutEntryAcl(void *copy, size_t size) : CopyOut(copy, size + sizeof(CSSM_ACL_ENTRY_PROTOTYPE), reinterpret_cast<xdrproc_t>(xdr_CSSM_ACL_ENTRY_PROTOTYPE_PTR)) { }
+ operator AclEntryPrototype *() { return static_cast<AclEntryPrototype *>(reinterpret_cast<CSSM_ACL_ENTRY_PROTOTYPE_PTR>(data())); }
+};
+
+class CopyOutOwnerAcl : public CopyOut {
+public:
+ CopyOutOwnerAcl(void *copy, size_t size) : CopyOut(copy, size + sizeof(CSSM_ACL_OWNER_PROTOTYPE), reinterpret_cast<xdrproc_t>(xdr_CSSM_ACL_OWNER_PROTOTYPE_PTR)) { }
+ operator AclOwnerPrototype *() { return static_cast<AclOwnerPrototype *>(reinterpret_cast<CSSM_ACL_OWNER_PROTOTYPE_PTR>(data())); }
+};
+
+class CopyOutAclEntryInput : public CopyOut {
+public:
+ CopyOutAclEntryInput(void *copy, size_t size) : CopyOut(copy, size + sizeof(CSSM_ACL_ENTRY_INPUT), reinterpret_cast<xdrproc_t>(xdr_CSSM_ACL_ENTRY_INPUT_PTR)) { }
+ operator AclEntryInput *() { return static_cast<AclEntryInput *>(reinterpret_cast<CSSM_ACL_ENTRY_INPUT_PTR>(data())); }
+};
+
+
+class CopyOutDeriveData : public CopyOut {
+public:
+ CopyOutDeriveData(void *copy, size_t size) : CopyOut(copy, size + sizeof(CSSM_DERIVE_DATA), reinterpret_cast<xdrproc_t>(xdr_CSSM_DERIVE_DATA_PTR)) { }
+ CSSM_DERIVE_DATA * derive_data() { return reinterpret_cast<CSSM_DERIVE_DATA *>(data()); }
+ CSSM_DATA &cssm_data() { return derive_data()->baseData; }
+ CSSM_ALGORITHMS algorithm() { return derive_data()->algorithm; }
+};
+
+
+class CopyOutContext : public CopyOut {
+public:
+ CopyOutContext(void *copy, size_t size) : CopyOut(copy, size + sizeof(CSSM_CONTEXT), reinterpret_cast<xdrproc_t>(xdr_CSSM_CONTEXT_PTR)) { }
+ operator Context *() { return static_cast<Context *>(reinterpret_cast<CSSM_CONTEXT_PTR>(data())); }
+ Context &context() { return *static_cast<Context *>(reinterpret_cast<CSSM_CONTEXT_PTR>(data())); }
+};
+
+class CopyOutKey : public CopyOut {
+public:
+ CopyOutKey(void *copy, size_t size) : CopyOut(copy, size + sizeof(CSSM_KEY), reinterpret_cast<xdrproc_t>(xdr_CSSM_KEY_PTR)) { }
+ operator CssmKey *() { return static_cast<CssmKey *>(reinterpret_cast<CSSM_KEY_PTR>(data())); }
+ CssmKey &key() { return *static_cast<CssmKey *>(reinterpret_cast<CSSM_KEY_PTR>(data())); }
+};
+
+class CopyOutDbRecordAttributes : public CopyOut {
+public:
+ CopyOutDbRecordAttributes(void *copy, size_t size) : CopyOut(copy, size + sizeof(CSSM_DB_RECORD_ATTRIBUTE_DATA), reinterpret_cast<xdrproc_t>(xdr_CSSM_DB_RECORD_ATTRIBUTE_DATA_PTR)) { }
+ CssmDbRecordAttributeData *attribute_data() { return static_cast<CssmDbRecordAttributeData *>(reinterpret_cast<CSSM_DB_RECORD_ATTRIBUTE_DATA_PTR>(data())); }
+};
+
+class CopyOutQuery : public CopyOut {
+public:
+ CopyOutQuery(void *copy, size_t size) : CopyOut(copy, size, reinterpret_cast<xdrproc_t>(xdr_CSSM_QUERY_PTR)) { }
+ operator CssmQuery *() { return static_cast<CssmQuery *>(reinterpret_cast<CSSM_QUERY_PTR>(data())); }
+};
+
+//
+// Take a DATA type RPC argument purportedly representing a Blob of some kind,
+// turn it into a Blob, and fail properly if it's not kosher.
+//
+template <class BlobType>
+const BlobType *makeBlob(const CssmData &blobData, CSSM_RETURN error = CSSM_ERRCODE_INVALID_DATA)
+{
+ if (!blobData.data() || blobData.length() < sizeof(BlobType))
+ CssmError::throwMe(error);
+ const BlobType *blob = static_cast<const BlobType *>(blobData.data());
+ if (blob->totalLength != blobData.length())
+ CssmError::throwMe(error);
+ return blob;
+}
+
+//
+// An OutputData object will take memory allocated within securityd,
+// hand it to the MIG return-output parameters, and schedule it to be released
+// after the MIG reply has been sent. It will also get rid of it in case of
+// error.
+//
+class OutputData : public CssmData {
+public:
+ OutputData(void **outP, mach_msg_type_number_t *outLength)
+ : mData(*outP), mLength(*outLength) { }
+ ~OutputData()
+ { mData = data(); mLength = length(); Server::releaseWhenDone(mData); }
+
+ void operator = (const CssmData &source)
+ { CssmData::operator = (source); }
+
+private:
+ void * &mData;
+ mach_msg_type_number_t &mLength;
+};
+
+//
+// Choose a Database from a choice of two sources, giving preference
+// to persistent stores and to earlier sources.
+//
+Database *pickDb(Database *db1, Database *db2);
+
+static inline Database *dbOf(Key *key) { return key ? &key->database() : NULL; }
+
+inline Database *pickDb(Key *k1, Key *k2) { return pickDb(dbOf(k1), dbOf(k2)); }
+inline Database *pickDb(Database *db1, Key *k2) { return pickDb(db1, dbOf(k2)); }
+inline Database *pickDb(Key *k1, Database *db2) { return pickDb(dbOf(k1), db2); }
+
+//
+// Choose a Database from a choice of two sources, giving preference
+// to persistent stores and to earlier sources.
+//
+Database *pickDb(Database *db1, Database *db2)
+{
+ // persistent db1 always wins
+ if (db1 && !db1->transient())
+ return db1;
+
+ // persistent db2 is next choice
+ if (db2 && !db2->transient())
+ return db2;
+
+ // pick any existing transient database
+ if (db1)
+ return db1;
+ if (db2)
+ return db2;
+
+ // none at all. use the canonical transient store
+ return Server::optionalDatabase(noDb);
+}
//
// Setup/Teardown functions.
kern_return_t ucsp_server_setup(UCSP_ARGS, mach_port_t taskPort, ClientSetupInfo info, const char *identity)
{
BEGIN_IPCN
- Server::active().setupConnection(Server::connectNewProcess, servicePort, replyPort,
- taskPort, auditToken, &info, identity);
+ SECURITYD_REQUEST_ENTRY((char*)"setup", NULL, NULL);
+ Server::active().setupConnection(Server::connectNewProcess, replyPort,
+ taskPort, auditToken, &info);
END_IPCN(CSSM)
+ if (*rcode)
+ Syslog::notice("setup(%s) failed rcode=%d", identity ? identity : "<NULL>", *rcode);
return KERN_SUCCESS;
}
-kern_return_t ucsp_server_setupNew(UCSP_ARGS, mach_port_t taskPort,
- ClientSetupInfo info, const char *identity,
- mach_port_t *newServicePort)
+
+kern_return_t ucsp_server_setupThread(UCSP_ARGS, mach_port_t taskPort)
{
+ SECURITYD_REQUEST_ENTRY((char*)"setupThread", NULL, NULL);
BEGIN_IPCN
- try {
- RefPointer<Session> session = new DynamicSession(taskPort);
- Server::active().setupConnection(Server::connectNewSession, session->servicePort(), replyPort,
- taskPort, auditToken, &info, identity);
- *newServicePort = session->servicePort();
- } catch (const MachPlusPlus::Error &err) {
- switch (err.error) {
- case BOOTSTRAP_SERVICE_ACTIVE:
- MacOSError::throwMe(errSessionAuthorizationDenied); // translate
- default:
- throw;
- }
- }
+ Server::active().setupConnection(Server::connectNewThread, replyPort, taskPort, auditToken);
END_IPCN(CSSM)
+ if (*rcode)
+ Syslog::notice("setupThread failed rcode=%d", *rcode);
return KERN_SUCCESS;
}
-kern_return_t ucsp_server_setupThread(UCSP_ARGS, mach_port_t taskPort)
+
+kern_return_t ucsp_server_teardown(UCSP_ARGS)
{
BEGIN_IPCN
- Server::active().setupConnection(Server::connectNewThread, servicePort, replyPort,
- taskPort, auditToken);
+ SECURITYD_REQUEST_ENTRY((char*)"teardown", NULL, NULL);
+ Server::active().endConnection(replyPort);
END_IPCN(CSSM)
return KERN_SUCCESS;
}
-
-kern_return_t ucsp_server_teardown(UCSP_ARGS)
+kern_return_t ucsp_server_verifyPrivileged(UCSP_ARGS)
{
BEGIN_IPCN
- Server::active().endConnection(replyPort);
+ SECURITYD_REQUEST_ENTRY((char*)"verifyPrivileged", NULL, NULL);
+ // doing nothing (we just want securityd's audit credentials returned)
END_IPCN(CSSM)
return KERN_SUCCESS;
}
+kern_return_t ucsp_server_verifyPrivileged2(UCSP_ARGS, mach_port_t *originPort)
+{
+ BEGIN_IPCN
+ SECURITYD_REQUEST_ENTRY((char*)"verifyPrivileged2", NULL, NULL);
+ // send the port back to the sender to check for a MitM (6986198)
+ *originPort = servicePort;
+ END_IPCN(CSSM)
+ return KERN_SUCCESS;
+}
//
// Common database operations
//
kern_return_t ucsp_server_authenticateDb(UCSP_ARGS, DbHandle db,
- CSSM_DB_ACCESS_TYPE accessType, COPY_IN(AccessCredentials, cred))
+ CSSM_DB_ACCESS_TYPE accessType, DATA_IN(cred))
{
- BEGIN_IPC
+ BEGIN_IPC(authenticateDb)
secdebug("dl", "authenticateDb");
- relocate(cred, credBase, credLength);
+ CopyOutAccessCredentials creds(cred, credLength);
// ignoring accessType
- Server::database(db)->authenticate(accessType, cred);
+ Server::database(db)->authenticate(accessType, creds);
END_IPC(DL)
}
kern_return_t ucsp_server_releaseDb(UCSP_ARGS, DbHandle db)
{
- BEGIN_IPC
+ BEGIN_IPC(releaseDb)
connection.process().kill(*Server::database(db));
END_IPC(DL)
}
kern_return_t ucsp_server_getDbName(UCSP_ARGS, DbHandle db, char name[PATH_MAX])
{
- BEGIN_IPC
+ BEGIN_IPC(getDbName)
string result = Server::database(db)->dbName();
assert(result.length() < PATH_MAX);
memcpy(name, result.c_str(), result.length() + 1);
kern_return_t ucsp_server_setDbName(UCSP_ARGS, DbHandle db, const char *name)
{
- BEGIN_IPC
+ BEGIN_IPC(setDbName)
Server::database(db)->dbName(name);
END_IPC(DL)
}
// External database interface
//
kern_return_t ucsp_server_openToken(UCSP_ARGS, uint32 ssid, FilePath name,
- COPY_IN(AccessCredentials, accessCredentials), DbHandle *db)
+ DATA_IN(accessCredentials), DbHandle *db)
{
- BEGIN_IPC
- relocate(accessCredentials, accessCredentialsBase, accessCredentialsLength);
- *db = (new TokenDatabase(ssid, connection.process(), name, accessCredentials))->handle();
+ BEGIN_IPC(openToken)
+ CopyOutAccessCredentials creds(accessCredentials, accessCredentialsLength);
+ *db = (new TokenDatabase(ssid, connection.process(), name, creds))->handle();
END_IPC(DL)
}
kern_return_t ucsp_server_findFirst(UCSP_ARGS, DbHandle db,
- COPY_IN(CssmQuery, query),
- COPY_IN(CssmDbRecordAttributeData, inAttributes),
- COPY_OUT(CssmDbRecordAttributeData, outAttributes),
- boolean_t getData,
- DATA_OUT(data), KeyHandle *hKey, SearchHandle *hSearch, RecordHandle *hRecord)
+ DATA_IN(inQuery), DATA_IN(inAttributes), DATA_OUT(outAttributes),
+ boolean_t getData, DATA_OUT(data),
+ KeyHandle *hKey, SearchHandle *hSearch, IPCRecordHandle *hRecord)
{
- BEGIN_IPC
- relocate(query, queryBase, queryLength);
- relocate(inAttributes, inAttributesBase, inAttributesLength);
+ BEGIN_IPC(findFirst)
+ CopyOutQuery query(inQuery, inQueryLength);
+ CopyOutDbRecordAttributes attrs(inAttributes, inAttributesLength);
RefPointer<Database::Search> search;
RefPointer<Database::Record> record;
RefPointer<Key> key;
- CssmData outData; //OutputData outData(data, dataLength);
- CssmDbRecordAttributeData *outAttrs; mach_msg_type_number_t outAttrsLength;
- Server::database(db)->findFirst(*query, inAttributes, inAttributesLength,
+ CssmData outData;
+ CssmDbRecordAttributeData *outAttrs = NULL; mach_msg_type_number_t outAttrsLength;
+ Server::database(db)->findFirst(*query,
+ attrs.attribute_data(), attrs.length(),
getData ? &outData : NULL, key, search, record, outAttrs, outAttrsLength);
// handle nothing-found case without exceptions
*hSearch = search->handle();
*hKey = key ? key->handle() : noKey;
- // return attributes (assumes relocated flat blob)
- flips(outAttrs, outAttributes, outAttributesBase);
- *outAttributesLength = outAttrsLength;
-
+ if (outAttrsLength && outAttrs) {
+ Server::releaseWhenDone(outAttrs); // exception proof it against next line
+ if (!copyin(outAttrs, reinterpret_cast<xdrproc_t> (xdr_CSSM_DB_RECORD_ATTRIBUTE_DATA), outAttributes, outAttributesLength))
+ CssmError::throwMe(CSSMERR_CSSM_MEMORY_ERROR);
+ Server::releaseWhenDone(*outAttributes);
+ }
+
// return data (temporary fix)
if (getData) {
- *data = outData.data();
- *dataLength = outData.length();
+ Server::releaseWhenDone(outData.data());
+ xdrproc_t encode_proc = reinterpret_cast<xdrproc_t>(xdr_CSSM_NO_KEY_IN_DATA);
+ if (key)
+ encode_proc = reinterpret_cast<xdrproc_t>(xdr_CSSM_KEY_IN_DATA);
+ if (!copyin(&outData, encode_proc, data, dataLength))
+ CssmError::throwMe(CSSMERR_CSSM_MEMORY_ERROR);
+ Server::releaseWhenDone(*data);
}
}
END_IPC(DL)
}
+
kern_return_t ucsp_server_findNext(UCSP_ARGS, SearchHandle hSearch,
- COPY_IN(CssmDbRecordAttributeData, inAttributes),
- COPY_OUT(CssmDbRecordAttributeData, outAttributes),
+ DATA_IN(inAttributes),
+ DATA_OUT(outAttributes),
boolean_t getData, DATA_OUT(data), KeyHandle *hKey,
- RecordHandle *hRecord)
+ IPCRecordHandle *hRecord)
{
- BEGIN_IPC
- relocate(inAttributes, inAttributesBase, inAttributesLength);
+ BEGIN_IPC(findNext)
+ CopyOutDbRecordAttributes attrs(inAttributes, inAttributesLength);
RefPointer<Database::Search> search =
Server::find<Database::Search>(hSearch, CSSMERR_DL_INVALID_RESULTS_HANDLE);
RefPointer<Database::Record> record;
RefPointer<Key> key;
- CssmData outData; //OutputData outData(data, dataLength);
- CssmDbRecordAttributeData *outAttrs; mach_msg_type_number_t outAttrsLength;
- search->database().findNext(search, inAttributes, inAttributesLength,
+ CssmData outData;
+ CssmDbRecordAttributeData *outAttrs = NULL; mach_msg_type_number_t outAttrsLength;
+ search->database().findNext(search, attrs.attribute_data(), attrs.length(),
getData ? &outData : NULL, key, record, outAttrs, outAttrsLength);
// handle nothing-found case without exceptions
*hRecord = record->handle();
*hKey = key ? key->handle() : noKey;
- // return attributes (assumes relocated flat blob)
- flips(outAttrs, outAttributes, outAttributesBase);
- *outAttributesLength = outAttrsLength;
-
+ if (outAttrsLength && outAttrs) {
+ secdebug("attrmem", "Found attrs: %p of length: %d", outAttrs, outAttrsLength);
+ Server::releaseWhenDone(outAttrs); // exception proof it against next line
+ if (!copyin(outAttrs, reinterpret_cast<xdrproc_t> (xdr_CSSM_DB_RECORD_ATTRIBUTE_DATA), outAttributes, outAttributesLength))
+ CssmError::throwMe(CSSMERR_CSSM_MEMORY_ERROR);
+ secdebug("attrmem", "Copied attrs: %p of length: %d", *outAttributes, *outAttributesLength);
+ Server::releaseWhenDone(*outAttributes);
+ }
+
// return data (temporary fix)
if (getData) {
- *data = outData.data();
- *dataLength = outData.length();
+ Server::releaseWhenDone(outData.data());
+ xdrproc_t encode_proc = reinterpret_cast<xdrproc_t>(xdr_CSSM_NO_KEY_IN_DATA);
+ if (key)
+ encode_proc = reinterpret_cast<xdrproc_t>(xdr_CSSM_KEY_IN_DATA);
+ if (!copyin(&outData, encode_proc, data, dataLength))
+ CssmError::throwMe(CSSMERR_CSSM_MEMORY_ERROR);
+ Server::releaseWhenDone(*data);
}
}
END_IPC(DL)
}
-kern_return_t ucsp_server_findRecordHandle(UCSP_ARGS, RecordHandle hRecord,
- COPY_IN(CssmDbRecordAttributeData, inAttributes),
- COPY_OUT(CssmDbRecordAttributeData, outAttributes),
+kern_return_t ucsp_server_findRecordHandle(UCSP_ARGS, IPCRecordHandle hRecord,
+ DATA_IN(inAttributes), DATA_OUT(outAttributes),
boolean_t getData, DATA_OUT(data), KeyHandle *hKey)
{
- BEGIN_IPC
- relocate(inAttributes, inAttributesBase, inAttributesLength);
+ BEGIN_IPC(findRecordHandle)
+ CopyOutDbRecordAttributes attrs(inAttributes, inAttributesLength);
RefPointer<Database::Record> record =
Server::find<Database::Record>(hRecord, CSSMERR_DL_INVALID_RECORD_UID);
RefPointer<Key> key;
- CssmData outData; //OutputData outData(data, dataLength);
+ CssmData outData;
CssmDbRecordAttributeData *outAttrs; mach_msg_type_number_t outAttrsLength;
- record->database().findRecordHandle(record, inAttributes, inAttributesLength,
+ record->database().findRecordHandle(record, attrs.attribute_data(), attrs.length(),
getData ? &outData : NULL, key, outAttrs, outAttrsLength);
// return handles
*hKey = key ? key->handle() : noKey;
- // return attributes (assumes relocated flat blob)
- flips(outAttrs, outAttributes, outAttributesBase);
- *outAttributesLength = outAttrsLength;
-
+ if (outAttrsLength && outAttrs) {
+ Server::releaseWhenDone(outAttrs); // exception proof it against next line
+ if (!copyin(outAttrs, reinterpret_cast<xdrproc_t> (xdr_CSSM_DB_RECORD_ATTRIBUTE_DATA), outAttributes, outAttributesLength))
+ CssmError::throwMe(CSSMERR_CSSM_MEMORY_ERROR);
+ Server::releaseWhenDone(*outAttributes);
+ }
+
// return data (temporary fix)
if (getData) {
- *data = outData.data();
- *dataLength = outData.length();
+ /*
+ We can't release this with the usual allocator (which calls free(), since
+ it was VM allocated. Part of the fix for:
+ <rdar://problem/6738709> securityd leaks VM memory during certain smartcard operations
+ will be to call Server::releaseWhenDone below with a new vm allocator param
+ */
+ Server::releaseWhenDone(outData.data());
+ xdrproc_t encode_proc = reinterpret_cast<xdrproc_t>(xdr_CSSM_NO_KEY_IN_DATA);
+ if (key)
+ encode_proc = reinterpret_cast<xdrproc_t>(xdr_CSSM_KEY_IN_DATA);
+ if (!copyin(&outData, encode_proc, data, dataLength))
+ CssmError::throwMe(CSSMERR_CSSM_MEMORY_ERROR);
+ Server::releaseWhenDone(*data);
}
END_IPC(DL)
}
kern_return_t ucsp_server_insertRecord(UCSP_ARGS, DbHandle db, CSSM_DB_RECORDTYPE recordType,
- COPY_IN(CssmDbRecordAttributeData, attributes), DATA_IN(data), RecordHandle *record)
-{
- BEGIN_IPC
- relocate(attributes, attributesBase, attributesLength);
- Server::database(db)->insertRecord(recordType, attributes, attributesLength,
- DATA(data), *record);
+ DATA_IN(inAttributes), DATA_IN(data), IPCRecordHandle *record)
+{
+ BEGIN_IPC(insertRecord)
+ RecordHandle recordHandle;
+ CopyOutDbRecordAttributes attrs(inAttributes, inAttributesLength);
+ Server::database(db)->insertRecord(recordType, attrs.attribute_data(), attrs.length(),
+ DATA(data), recordHandle);
+ *record = recordHandle;
END_IPC(DL)
}
-kern_return_t ucsp_server_modifyRecord(UCSP_ARGS, DbHandle db, RecordHandle *hRecord,
- CSSM_DB_RECORDTYPE recordType, COPY_IN(CssmDbRecordAttributeData, attributes),
+kern_return_t ucsp_server_modifyRecord(UCSP_ARGS, DbHandle db, IPCRecordHandle *hRecord,
+ CSSM_DB_RECORDTYPE recordType, DATA_IN(attributes),
boolean_t setData, DATA_IN(data), CSSM_DB_MODIFY_MODE modifyMode)
{
- BEGIN_IPC
- relocate(attributes, attributesBase, attributesLength);
+ BEGIN_IPC(modifyRecord)
+ CopyOutDbRecordAttributes attrs(attributes, attributesLength);
CssmData newData(DATA(data));
RefPointer<Database::Record> record =
Server::find<Database::Record>(*hRecord, CSSMERR_DL_INVALID_RECORD_UID);
- Server::database(db)->modifyRecord(recordType, record, attributes, attributesLength,
+ Server::database(db)->modifyRecord(recordType, record, attrs.attribute_data(), attrs.length(),
setData ? &newData : NULL, modifyMode);
// note that the record handle presented to the client never changes here
// (we could, but have no reason to - our record handles are just always up to date)
END_IPC(DL)
}
-kern_return_t ucsp_server_deleteRecord(UCSP_ARGS, DbHandle db, RecordHandle hRecord)
+kern_return_t ucsp_server_deleteRecord(UCSP_ARGS, DbHandle db, IPCRecordHandle hRecord)
{
- BEGIN_IPC
+ BEGIN_IPC(deleteRecord)
Server::database(db)->deleteRecord(
Server::find<Database::Record>(hRecord, CSSMERR_DL_INVALID_RECORD_UID));
END_IPC(DL)
kern_return_t ucsp_server_releaseSearch(UCSP_ARGS, SearchHandle hSearch)
{
- BEGIN_IPC
+ BEGIN_IPC(releaseSearch)
RefPointer<Database::Search> search = Server::find<Database::Search>(hSearch, 0);
search->database().releaseSearch(*search);
END_IPC(DL)
}
-kern_return_t ucsp_server_releaseRecord(UCSP_ARGS, RecordHandle hRecord)
+kern_return_t ucsp_server_releaseRecord(UCSP_ARGS, IPCRecordHandle hRecord)
{
- BEGIN_IPC
+ BEGIN_IPC(releaseRecord)
RefPointer<Database::Record> record = Server::find<Database::Record>(hRecord, 0);
record->database().releaseRecord(*record);
END_IPC(DL)
}
-kern_return_t ucsp_server_getRecordFromHandle(UCSP_ARGS, RecordHandle record,
- COPY_IN(CssmDbRecordAttributeData, inAttributes),
- COPY_OUT(CssmDbRecordAttributeData, outAttributes),
- boolean_t getData,
- DATA_OUT(data))
-{
- BEGIN_IPC
- secdebug("dl", "getRecordFromHandle");
- relocate(inAttributes, inAttributesBase, inAttributesLength);
- // @@@
- END_IPC(DL)
-}
-
//
// Internal database management
//
kern_return_t ucsp_server_createDb(UCSP_ARGS, DbHandle *db,
- COPY_IN(DLDbFlatIdentifier, ident),
- COPY_IN(AccessCredentials, cred), COPY_IN(AclEntryPrototype, owner),
+ DATA_IN(ident), DATA_IN(cred), DATA_IN(owner),
DBParameters params)
{
- BEGIN_IPC
- relocate(cred, credBase, credLength);
- relocate(owner, ownerBase, ownerLength);
- relocate(ident, identBase, identLength);
- *db = (new KeychainDatabase(*ident, params, connection.process(), cred, owner))->handle();
+ BEGIN_IPC(createDb)
+ CopyOutAccessCredentials creds(cred, credLength);
+ CopyOutEntryAcl owneracl(owner, ownerLength);
+ CopyOut flatident(ident, identLength, reinterpret_cast<xdrproc_t>(xdr_DLDbFlatIdentifierRef));
+ *db = (new KeychainDatabase(*reinterpret_cast<DLDbFlatIdentifier*>(flatident.data()), params, connection.process(), creds, owneracl))->handle();
END_IPC(DL)
}
-// keychain synchronization
-// @@@ caller should be required to call decodeDb() to get a DbHandle
-// instead of passing the blob itself
-kern_return_t ucsp_server_cloneDbForSync(UCSP_ARGS, DATA_IN(blob),
- DbHandle srcDb, DATA_IN(agentData), DbHandle *newDb)
+kern_return_t ucsp_server_recodeDbForSync(UCSP_ARGS, DbHandle dbToClone,
+ DbHandle srcDb, DbHandle *newDb)
{
- BEGIN_IPC
+ BEGIN_IPC(recodeDbForSync)
RefPointer<KeychainDatabase> srcKC = Server::keychain(srcDb);
- *newDb = (new KeychainDatabase(*srcKC, connection.process(),
- SSBLOB(DbBlob, blob), DATA(agentData)))->handle();
+ *newDb = (new KeychainDatabase(*srcKC, connection.process(), dbToClone))->handle();
+ END_IPC(DL)
+}
+
+kern_return_t ucsp_server_authenticateDbsForSync(UCSP_ARGS, DATA_IN(dbHandleArray),
+ DATA_IN(agentData), DbHandle* authenticatedDBHandle)
+{
+ BEGIN_IPC(authenticateDbsForSync)
+ QueryDBBlobSecret query;
+ query.inferHints(connection.process());
+ query.addHint(AGENT_HINT_KCSYNC_DICT, agentData, agentDataLength);
+ CSSM_DATA dbData = DATA(dbHandleArray);
+ uint8 ipcDbHandleArrayCount = *(dbData.Data);
+ DbHandle *ipcDbHandleArray = (DbHandle *)Allocator::standard().malloc(ipcDbHandleArrayCount * sizeof(DbHandle));
+ if ( ipcDbHandleArray == 0 )
+ CssmError::throwMe(CSSMERR_CSSM_MEMORY_ERROR);
+ DbHandle *currIPCDbHandleArrayPtr = ipcDbHandleArray;
+ DbHandle *dbHandleArrayPtr = (DbHandle *)(dbData.Data+1);
+ int index;
+ for (index=0; index < ipcDbHandleArrayCount; index++)
+ {
+ *currIPCDbHandleArrayPtr = *dbHandleArrayPtr;
+ Server::keychain(*currIPCDbHandleArrayPtr)->lockDb(); // lock this db if it was unlocked in the past (user could have deleted the kc, resetLogin, etc.)
+ currIPCDbHandleArrayPtr++;
+ dbHandleArrayPtr++;
+ }
+ Server::releaseWhenDone(ipcDbHandleArray);
+ if (query(ipcDbHandleArray, ipcDbHandleArrayCount, authenticatedDBHandle) != SecurityAgent::noReason)
+ CssmError::throwMe(CSSM_ERRCODE_OPERATION_AUTH_DENIED);
END_IPC(DL)
}
kern_return_t ucsp_server_commitDbForSync(UCSP_ARGS, DbHandle srcDb,
DbHandle cloneDb, DATA_OUT(blob))
{
- BEGIN_IPC
+ BEGIN_IPC(commitDbForSync)
RefPointer<KeychainDatabase> srcKC = Server::keychain(srcDb);
RefPointer<KeychainDatabase> cloneKC = Server::keychain(cloneDb);
srcKC->commitSecretsForSync(*cloneKC);
}
kern_return_t ucsp_server_decodeDb(UCSP_ARGS, DbHandle *db,
- COPY_IN(DLDbFlatIdentifier, ident), COPY_IN(AccessCredentials, cred), DATA_IN(blob))
+ DATA_IN(ident), DATA_IN(cred), DATA_IN(blob))
{
- BEGIN_IPC
- relocate(cred, credBase, credLength);
- relocate(ident, identBase, identLength);
- *db = (new KeychainDatabase(*ident, SSBLOB(DbBlob, blob),
- connection.process(), cred))->handle();
+ BEGIN_IPC(decodeDb)
+ CopyOutAccessCredentials creds(cred, credLength);
+ CopyOut flatident(ident, identLength, reinterpret_cast<xdrproc_t>(xdr_DLDbFlatIdentifierRef));
+ DLDbFlatIdentifier* flatID = (DLDbFlatIdentifier*) flatident.data();
+ DLDbIdentifier id = *flatID; // invokes a casting operator
+
+ *db = (new KeychainDatabase(id, SSBLOB(DbBlob, blob),
+ connection.process(), creds))->handle();
END_IPC(DL)
}
kern_return_t ucsp_server_encodeDb(UCSP_ARGS, DbHandle db, DATA_OUT(blob))
{
- BEGIN_IPC
+ BEGIN_IPC(encodeDb)
DbBlob *dbBlob = Server::keychain(db)->blob(); // memory owned by database
*blob = dbBlob;
*blobLength = dbBlob->length();
kern_return_t ucsp_server_setDbParameters(UCSP_ARGS, DbHandle db, DBParameters params)
{
- BEGIN_IPC
+ BEGIN_IPC(setDbParameters)
Server::keychain(db)->setParameters(params);
END_IPC(DL)
}
kern_return_t ucsp_server_getDbParameters(UCSP_ARGS, DbHandle db, DBParameters *params)
{
- BEGIN_IPC
+ BEGIN_IPC(getDbParameters)
Server::keychain(db)->getParameters(*params);
END_IPC(DL)
}
kern_return_t ucsp_server_changePassphrase(UCSP_ARGS, DbHandle db,
- COPY_IN(AccessCredentials, cred))
+ DATA_IN(cred))
{
- BEGIN_IPC
- relocate(cred, credBase, credLength);
- Server::keychain(db)->changePassphrase(cred);
+ BEGIN_IPC(changePassphrase)
+ CopyOutAccessCredentials creds(cred, credLength);
+ Server::keychain(db)->changePassphrase(creds);
END_IPC(DL)
}
kern_return_t ucsp_server_lockAll (UCSP_ARGS, boolean_t)
{
- BEGIN_IPC
+ BEGIN_IPC(lockAll)
connection.session().processLockAll();
END_IPC(DL)
}
kern_return_t ucsp_server_unlockDb(UCSP_ARGS, DbHandle db)
{
- BEGIN_IPC
+ BEGIN_IPC(unlockDb)
Server::keychain(db)->unlockDb();
END_IPC(DL)
}
+static void check_stash_entitlement(Process & proc)
+{
+ OSStatus status = noErr;
+ CFDictionaryRef code_info = NULL;
+ CFDictionaryRef entitlements = NULL;
+ CFTypeRef value = NULL;
+ bool entitled = false;
+
+ status = SecCodeCopySigningInformation(proc.processCode(), kSecCSRequirementInformation, &code_info);
+ require_noerr(status, done);
+
+ if (CFDictionaryGetValueIfPresent(code_info, kSecCodeInfoEntitlementsDict, &value)) {
+ if (CFGetTypeID(value) == CFDictionaryGetTypeID()) {
+ entitlements = (CFDictionaryRef)value;
+ }
+ }
+ require(entitlements != NULL, done);
+
+ if (CFDictionaryGetValueIfPresent(entitlements, CFSTR("com.apple.private.securityd.stash"), &value)) {
+ if (CFGetTypeID(value) && CFBooleanGetTypeID()) {
+ entitled = CFBooleanGetValue((CFBooleanRef)value);
+ }
+ }
+
+done:
+ if (code_info) {
+ CFRelease(code_info);
+ }
+
+ if (!entitled) {
+ CssmError::throwMe(CSSM_ERRCODE_OS_ACCESS_DENIED);
+ }
+}
+
kern_return_t ucsp_server_unlockDbWithPassphrase(UCSP_ARGS, DbHandle db, DATA_IN(passphrase))
{
- BEGIN_IPC
- Server::keychain(db)->unlockDb(DATA(passphrase));
+ BEGIN_IPC(unlockDbWithPassphrase)
+ Server::keychain(db)->unlockDb(DATA(passphrase));
END_IPC(DL)
}
+kern_return_t ucsp_server_stashDb(UCSP_ARGS, DbHandle db)
+{
+ BEGIN_IPC(stashDb)
+ check_stash_entitlement(connection.process());
+ Server::keychain(db)->stashDb();
+ END_IPC(DL)
+}
+
+kern_return_t ucsp_server_stashDbCheck(UCSP_ARGS, DbHandle db)
+{
+ BEGIN_IPC(stashDbCheck)
+ check_stash_entitlement(connection.process());
+ Server::keychain(db)->stashDbCheck();
+ END_IPC(DL)
+}
+
kern_return_t ucsp_server_isLocked(UCSP_ARGS, DbHandle db, boolean_t *locked)
{
- BEGIN_IPC
+ BEGIN_IPC(isLocked)
*locked = Server::database(db)->isLocked();
END_IPC(DL)
}
+kern_return_t ucsp_server_verifyKeyStorePassphrase(UCSP_ARGS, uint32_t retries)
+{
+ BEGIN_IPC(verifyKeyStorePassphrase)
+ connection.process().session().verifyKeyStorePassphrase(retries);
+ END_IPC(DL)
+}
+
+kern_return_t ucsp_server_changeKeyStorePassphrase(UCSP_ARGS)
+{
+ BEGIN_IPC(verifyKeyStorePassphrase)
+ connection.process().session().changeKeyStorePassphrase();
+ END_IPC(DL)
+}
+
+kern_return_t ucsp_server_resetKeyStorePassphrase(UCSP_ARGS, DATA_IN(passphrase))
+{
+ BEGIN_IPC(verifyKeyStorePassphrase)
+ connection.process().session().resetKeyStorePassphrase(DATA(passphrase));
+ END_IPC(DL)
+}
//
// Key management
kern_return_t ucsp_server_encodeKey(UCSP_ARGS, KeyHandle keyh, DATA_OUT(blob),
boolean_t wantUid, DATA_OUT(uid))
{
- BEGIN_IPC
+ BEGIN_IPC(encodeKey)
RefPointer<Key> gKey = Server::key(keyh);
if (KeychainKey *key = dynamic_cast<KeychainKey *>(gKey.get())) {
KeyBlob *keyBlob = key->blob(); // still owned by key
END_IPC(CSP)
}
-kern_return_t ucsp_server_decodeKey(UCSP_ARGS, KeyHandle *keyh, CssmKey::Header *header,
+kern_return_t ucsp_server_decodeKey(UCSP_ARGS, KeyHandle *keyh, DATA_OUT(keyHeader),
DbHandle db, DATA_IN(blob))
{
- BEGIN_IPC
+ BEGIN_IPC(decodeKey)
RefPointer<Key> key = new KeychainKey(*Server::keychain(db), SSBLOB(KeyBlob, blob));
- key->returnKey(*keyh, *header);
- flip(*header);
+ CssmKey::Header header;
+ key->returnKey(*keyh, header);
+ if (!copyin(&header, reinterpret_cast<xdrproc_t> (xdr_CSSM_KEYHEADER), keyHeader, keyHeaderLength))
+ CssmError::throwMe(CSSMERR_CSSM_MEMORY_ERROR);
+ Server::releaseWhenDone(*keyHeader);
END_IPC(CSP)
}
kern_return_t ucsp_server_recodeKey(UCSP_ARGS, DbHandle oldDb, KeyHandle keyh,
DbHandle newDb, DATA_OUT(newBlob))
{
- BEGIN_IPC
+ BEGIN_IPC(recodeKey)
// If the old key is passed in as DATA_IN(oldBlob):
// RefPointer<KeychainKey> key = new KeychainKey(*Server::keychain(oldDb), SSBLOB(KeyBlob, oldBlob));
RefPointer<Key> key = Server::key(keyh);
kern_return_t ucsp_server_releaseKey(UCSP_ARGS, KeyHandle keyh)
{
- BEGIN_IPC
+ BEGIN_IPC(releaseKey)
RefPointer<Key> key = Server::key(keyh);
key->database().releaseKey(*key);
END_IPC(CSP)
kern_return_t ucsp_server_queryKeySizeInBits(UCSP_ARGS, KeyHandle keyh, CSSM_KEY_SIZE *length)
{
- BEGIN_IPC
+ BEGIN_IPC(queryKeySizeInBits)
RefPointer<Key> key = Server::key(keyh);
key->database().queryKeySizeInBits(*key, CssmKeySize::overlay(*length));
END_IPC(CSP)
}
-kern_return_t ucsp_server_getOutputSize(UCSP_ARGS, CONTEXT_ARGS, KeyHandle keyh,
+kern_return_t ucsp_server_getOutputSize(UCSP_ARGS, DATA_IN(context), KeyHandle keyh,
uint32 inputSize, boolean_t encrypt, uint32 *outputSize)
{
- BEGIN_IPC
- relocate(context, contextBase, attributes, attrSize);
+ BEGIN_IPC(getOutputSize)
+ CopyOutContext ctx(context, contextLength);
RefPointer<Key> key = Server::key(keyh);
- key->database().getOutputSize(context, *key, inputSize, encrypt, *outputSize);
+ key->database().getOutputSize(*ctx, *key, inputSize, encrypt, *outputSize);
END_IPC(CSP)
}
kern_return_t ucsp_server_getKeyDigest(UCSP_ARGS, KeyHandle key, DATA_OUT(digest))
{
- BEGIN_IPC
+ BEGIN_IPC(getKeyDigest)
CssmData digestData = Server::key(key)->canonicalDigest();
*digest = digestData.data();
*digestLength = digestData.length();
//
// Signatures and MACs
//
-kern_return_t ucsp_server_generateSignature(UCSP_ARGS, CONTEXT_ARGS, KeyHandle keyh,
+kern_return_t ucsp_server_generateSignature(UCSP_ARGS, DATA_IN(context), KeyHandle keyh,
CSSM_ALGORITHMS signOnlyAlgorithm, DATA_IN(data), DATA_OUT(signature))
{
- BEGIN_IPC
- relocate(context, contextBase, attributes, attrSize);
+ BEGIN_IPC(generateSignature)
+ CopyOutContext ctx(context, contextLength);
RefPointer<Key> key = Server::key(keyh);
OutputData sigData(signature, signatureLength);
- key->database().generateSignature(context, *key, signOnlyAlgorithm,
+ key->database().generateSignature(*ctx, *key, signOnlyAlgorithm,
DATA(data), sigData);
END_IPC(CSP)
}
-kern_return_t ucsp_server_verifySignature(UCSP_ARGS, CONTEXT_ARGS, KeyHandle keyh,
+kern_return_t ucsp_server_verifySignature(UCSP_ARGS, DATA_IN(context), KeyHandle keyh,
CSSM_ALGORITHMS verifyOnlyAlgorithm, DATA_IN(data), DATA_IN(signature))
{
- BEGIN_IPC
- relocate(context, contextBase, attributes, attrSize);
+ BEGIN_IPC(verifySignature)
+ CopyOutContext ctx(context, contextLength);
RefPointer<Key> key = Server::key(keyh);
- key->database().verifySignature(context, *key, verifyOnlyAlgorithm,
+ key->database().verifySignature(*ctx, *key, verifyOnlyAlgorithm,
DATA(data), DATA(signature));
END_IPC(CSP)
}
-kern_return_t ucsp_server_generateMac(UCSP_ARGS, CONTEXT_ARGS, KeyHandle keyh,
+kern_return_t ucsp_server_generateMac(UCSP_ARGS, DATA_IN(context), KeyHandle keyh,
DATA_IN(data), DATA_OUT(mac))
{
- BEGIN_IPC
- relocate(context, contextBase, attributes, attrSize);
+ BEGIN_IPC(generateMac)
+ CopyOutContext ctx(context, contextLength);
RefPointer<Key> key = Server::key(keyh);
OutputData macData(mac, macLength);
- key->database().generateMac(context, *key, DATA(data), macData);
+ key->database().generateMac(*ctx, *key, DATA(data), macData);
END_IPC(CSP)
}
-kern_return_t ucsp_server_verifyMac(UCSP_ARGS, CONTEXT_ARGS, KeyHandle keyh,
+kern_return_t ucsp_server_verifyMac(UCSP_ARGS, DATA_IN(context), KeyHandle keyh,
DATA_IN(data), DATA_IN(mac))
{
- BEGIN_IPC
- relocate(context, contextBase, attributes, attrSize);
+ BEGIN_IPC(verifyMac)
+ CopyOutContext ctx(context, contextLength);
RefPointer<Key> key = Server::key(keyh);
- key->database().verifyMac(context, *key, DATA(data), DATA(mac));
+ key->database().verifyMac(*ctx, *key, DATA(data), DATA(mac));
END_IPC(CSP)
}
//
// Encryption/Decryption
//
-kern_return_t ucsp_server_encrypt(UCSP_ARGS, CONTEXT_ARGS, KeyHandle keyh,
+kern_return_t ucsp_server_encrypt(UCSP_ARGS, DATA_IN(context), KeyHandle keyh,
DATA_IN(clear), DATA_OUT(cipher))
{
- BEGIN_IPC
- relocate(context, contextBase, attributes, attrSize);
+ BEGIN_IPC(encrypt)
+ CopyOutContext ctx(context, contextLength);
RefPointer<Key> key = Server::key(keyh);
OutputData cipherOut(cipher, cipherLength);
- key->database().encrypt(context, *key, DATA(clear), cipherOut);
+ key->database().encrypt(*ctx, *key, DATA(clear), cipherOut);
END_IPC(CSP)
}
-kern_return_t ucsp_server_decrypt(UCSP_ARGS, CONTEXT_ARGS, KeyHandle keyh,
+kern_return_t ucsp_server_decrypt(UCSP_ARGS, DATA_IN(context), KeyHandle keyh,
DATA_IN(cipher), DATA_OUT(clear))
{
- BEGIN_IPC
- relocate(context, contextBase, attributes, attrSize);
+ BEGIN_IPC(decrypt)
+ CopyOutContext ctx(context, contextLength);
RefPointer<Key> key = Server::key(keyh);
OutputData clearOut(clear, clearLength);
- key->database().decrypt(context, *key, DATA(cipher), clearOut);
+ key->database().decrypt(*ctx, *key, DATA(cipher), clearOut);
END_IPC(CSP)
}
//
// Key generation
//
-kern_return_t ucsp_server_generateKey(UCSP_ARGS, DbHandle db, CONTEXT_ARGS,
- COPY_IN(AccessCredentials, cred), COPY_IN(AclEntryPrototype, owner),
- uint32 usage, uint32 attrs, KeyHandle *newKey, CssmKey::Header *newHeader)
-{
- BEGIN_IPC
- relocate(context, contextBase, attributes, attrSize);
- relocate(cred, credBase, credLength);
- relocate(owner, ownerBase, ownerLength);
+kern_return_t ucsp_server_generateKey(UCSP_ARGS, DbHandle db, DATA_IN(context),
+ DATA_IN(cred), DATA_IN(owner),
+ uint32 usage, uint32 attrs, KeyHandle *newKey, DATA_OUT(keyHeader))
+{
+ BEGIN_IPC(generateKey)
+ CopyOutContext ctx(context, contextLength);
+ CopyOutAccessCredentials creds(cred, credLength);
+
+ CopyOutEntryAcl owneracl(owner, ownerLength);
//@@@ preliminary interpretation - will get "type handle"
RefPointer<Database> database =
Server::optionalDatabase(db, attrs & CSSM_KEYATTR_PERMANENT);
RefPointer<Key> key;
- database->generateKey(context, cred, owner, usage, attrs, key);
- key->returnKey(*newKey, *newHeader);
- flip(*newHeader);
+ database->generateKey(*ctx, creds, owneracl, usage, attrs, key);
+ CssmKey::Header newHeader;
+ key->returnKey(*newKey, newHeader);
+
+ if (!copyin(&newHeader, reinterpret_cast<xdrproc_t> (xdr_CSSM_KEYHEADER), keyHeader, keyHeaderLength))
+ CssmError::throwMe(CSSMERR_CSSM_MEMORY_ERROR);
+ Server::releaseWhenDone(*keyHeader);
END_IPC(CSP)
}
-kern_return_t ucsp_server_generateKeyPair(UCSP_ARGS, DbHandle db, CONTEXT_ARGS,
- COPY_IN(AccessCredentials, cred), COPY_IN(AclEntryPrototype, owner),
+kern_return_t ucsp_server_generateKeyPair(UCSP_ARGS, DbHandle db, DATA_IN(context),
+ DATA_IN(cred), DATA_IN(owner),
uint32 pubUsage, uint32 pubAttrs, uint32 privUsage, uint32 privAttrs,
- KeyHandle *pubKey, CssmKey::Header *pubHeader, KeyHandle *privKey, CssmKey::Header *privHeader)
+ KeyHandle *pubKey, DATA_OUT(pubHeader), KeyHandle *privKey, DATA_OUT(privHeader))
{
- BEGIN_IPC
- relocate(context, contextBase, attributes, attrSize);
- relocate(cred, credBase, credLength);
- relocate(owner, ownerBase, ownerLength);
+ BEGIN_IPC(generateKeyPair)
+ CopyOutContext ctx(context, contextLength);
+ CopyOutAccessCredentials creds(cred, credLength);
+ CopyOutEntryAcl owneracl(owner, ownerLength);
RefPointer<Database> database =
Server::optionalDatabase(db, (privAttrs | pubAttrs) & CSSM_KEYATTR_PERMANENT);
RefPointer<Key> pub, priv;
- database->generateKey(context, cred, owner,
+ database->generateKey(*ctx, creds, owneracl,
pubUsage, pubAttrs, privUsage, privAttrs, pub, priv);
- pub->returnKey(*pubKey, *pubHeader);
- flip(*pubHeader);
- priv->returnKey(*privKey, *privHeader);
- flip(*privHeader);
+ CssmKey::Header tmpPubHeader, tmpPrivHeader;
+
+ pub->returnKey(*pubKey, tmpPubHeader);
+ if (!copyin(&tmpPubHeader, reinterpret_cast<xdrproc_t> (xdr_CSSM_KEYHEADER), pubHeader, pubHeaderLength))
+ CssmError::throwMe(CSSMERR_CSSM_MEMORY_ERROR);
+ Server::releaseWhenDone(*pubHeader);
+
+ priv->returnKey(*privKey, tmpPrivHeader);
+ if (!copyin(&tmpPrivHeader, reinterpret_cast<xdrproc_t> (xdr_CSSM_KEYHEADER), privHeader, privHeaderLength))
+ CssmError::throwMe(CSSMERR_CSSM_MEMORY_ERROR);
+ Server::releaseWhenDone(*privHeader);
+
END_IPC(CSP)
}
//
// Key wrapping and unwrapping
//
-kern_return_t ucsp_server_wrapKey(UCSP_ARGS, CONTEXT_ARGS, KeyHandle hWrappingKey,
- COPY_IN(AccessCredentials, cred), KeyHandle hKeyToBeWrapped,
- DATA_IN(descriptiveData), CssmKey *wrappedKey, DATA_OUT(keyData))
-{
- BEGIN_IPC
- relocate(context, contextBase, attributes, attrSize);
- relocate(cred, credBase, credLength);
+kern_return_t ucsp_server_wrapKey(UCSP_ARGS, DATA_IN(context), KeyHandle hWrappingKey,
+ DATA_IN(cred), KeyHandle hKeyToBeWrapped,
+ DATA_IN(descriptiveData), DATA_OUT(wrappedKeyData))
+{
+ BEGIN_IPC(wrapKey)
+ CssmKey wrappedKey;
+ CopyOutContext ctx(context, contextLength);
+ CopyOutAccessCredentials creds(cred, credLength);
RefPointer<Key> subjectKey = Server::key(hKeyToBeWrapped);
RefPointer<Key> wrappingKey = Server::optionalKey(hWrappingKey);
- if ((context.algorithm() == CSSM_ALGID_NONE && subjectKey->attribute(CSSM_KEYATTR_SENSITIVE))
+ if ((ctx.context().algorithm() == CSSM_ALGID_NONE && subjectKey->attribute(CSSM_KEYATTR_SENSITIVE))
|| !subjectKey->attribute(CSSM_KEYATTR_EXTRACTABLE))
CssmError::throwMe(CSSMERR_CSP_INVALID_KEYATTR_MASK);
- pickDb(subjectKey, wrappingKey)->wrapKey(context, cred, wrappingKey, *subjectKey, DATA(descriptiveData), *wrappedKey);
+ pickDb(subjectKey, wrappingKey)->wrapKey(*ctx, creds, wrappingKey, *subjectKey, DATA(descriptiveData), wrappedKey);
+ Server::releaseWhenDone(wrappedKey.keyData().data());
- // transmit key data back as a separate blob
- OutputData keyDatas(keyData, keyDataLength);
- keyDatas = wrappedKey->keyData();
- flip(*wrappedKey);
+ if (!copyin(&wrappedKey, reinterpret_cast<xdrproc_t> (xdr_CSSM_KEY), wrappedKeyData, wrappedKeyDataLength))
+ CssmError::throwMe(CSSMERR_CSSM_MEMORY_ERROR);
+
+ Server::releaseWhenDone(*wrappedKeyData);
END_IPC(CSP)
}
-kern_return_t ucsp_server_unwrapKey(UCSP_ARGS, DbHandle db, CONTEXT_ARGS,
- KeyHandle hWrappingKey, COPY_IN(AccessCredentials, cred), COPY_IN(AclEntryPrototype, owner),
- KeyHandle hPublicKey, CssmKey wrappedKey, DATA_IN(wrappedKeyData),
+kern_return_t ucsp_server_unwrapKey(UCSP_ARGS, DbHandle db, DATA_IN(context),
+ KeyHandle hWrappingKey, DATA_IN(cred), DATA_IN(owner),
+ KeyHandle hPublicKey, DATA_IN(wrappedKeyData),
CSSM_KEYUSE usage, CSSM_KEYATTR_FLAGS attrs, DATA_OUT(descriptiveData),
- KeyHandle *newKey, CssmKey::Header *newHeader)
-{
- BEGIN_IPC
- relocate(context, contextBase, attributes, attrSize);
- flip(wrappedKey);
- wrappedKey.keyData() = DATA(wrappedKeyData);
- relocate(cred, credBase, credLength);
- relocate(owner, ownerBase, ownerLength);
+ KeyHandle *newKey, DATA_OUT(keyHeader)/*CssmKey::Header *newHeader*/)
+{
+ BEGIN_IPC(unwrapKey)
+ CopyOutContext ctx(context, contextLength);
+ CopyOutKey wrappedKey(wrappedKeyData, wrappedKeyDataLength);
+ CopyOutAccessCredentials creds(cred, credLength);
+ CopyOutEntryAcl owneracl(owner, ownerLength);
OutputData descriptiveDatas(descriptiveData, descriptiveDataLength);
RefPointer<Key> wrappingKey = Server::optionalKey(hWrappingKey);
RefPointer<Key> unwrappedKey;
- pickDb(Server::optionalDatabase(db), wrappingKey)->unwrapKey(context, cred, owner,
+ pickDb(Server::optionalDatabase(db), wrappingKey)->unwrapKey(*ctx, creds, owneracl,
wrappingKey, Server::optionalKey(hPublicKey),
- usage, attrs, wrappedKey, unwrappedKey, descriptiveDatas);
- unwrappedKey->returnKey(*newKey, *newHeader);
- flip(*newHeader);
+ usage, attrs, wrappedKey.key(), unwrappedKey, descriptiveDatas);
+
+ CssmKey::Header newHeader;
+ unwrappedKey->returnKey(*newKey, newHeader);
+ if (!copyin(&newHeader, reinterpret_cast<xdrproc_t> (xdr_CSSM_KEYHEADER), keyHeader, keyHeaderLength))
+ CssmError::throwMe(CSSMERR_CSSM_MEMORY_ERROR);
+ Server::releaseWhenDone(*keyHeader);
+
END_IPC(CSP)
}
// (artificial) POD CssmDeriveData handles those that are known; if you add
// an algorithm with structured param, you need to add a case there.
//
-kern_return_t ucsp_server_deriveKey(UCSP_ARGS, DbHandle db, CONTEXT_ARGS, KeyHandle hKey,
- COPY_IN(AccessCredentials, cred), COPY_IN(AclEntryPrototype, owner),
- COPY_IN(CssmDeriveData, paramInput), DATA_OUT(paramOutput),
- uint32 usage, uint32 attrs, KeyHandle *newKey, CssmKey::Header *newHeader)
-{
- BEGIN_IPC
- relocate(context, contextBase, attributes, attrSize);
- relocate(cred, credBase, credLength);
- relocate(owner, ownerBase, ownerLength);
- relocate(paramInput, paramInputBase, paramInputLength);
- if (!paramInput || paramInput->algorithm != context.algorithm())
+kern_return_t ucsp_server_deriveKey(UCSP_ARGS, DbHandle db, DATA_IN(context), KeyHandle hKey,
+ DATA_IN(cred), DATA_IN(owner),
+ DATA_IN(paramInput), DATA_OUT(paramOutput),
+ uint32 usage, uint32 attrs, KeyHandle *newKey, DATA_OUT(keyHeader))
+{
+ BEGIN_IPC(deriveKey)
+ CopyOutContext ctx(context, contextLength);
+ CopyOutAccessCredentials creds(cred, credLength);
+ CopyOutEntryAcl owneracl(owner, ownerLength);
+ CopyOutDeriveData deriveParam(paramInput, paramInputLength);
+ if (deriveParam.algorithm() != ctx.context().algorithm())
CssmError::throwMe(CSSMERR_CSP_INTERNAL_ERROR); // client layer fault
RefPointer<Database> database =
Server::optionalDatabase(db, attrs & CSSM_KEYATTR_PERMANENT);
RefPointer<Key> key = Server::optionalKey(hKey);
- CssmData *param = paramInput ? ¶mInput->baseData : NULL;
- RefPointer<Key> derivedKey;
+ CSSM_DATA param = deriveParam.cssm_data();
+ RefPointer<Key> derivedKey;
pickDb(Server::optionalDatabase(db, attrs & CSSM_KEYATTR_PERMANENT),
- key)->deriveKey(context, key, cred, owner, param, usage, attrs, derivedKey);
- derivedKey->returnKey(*newKey, *newHeader);
- flip(*newHeader);
- if (param && param->length()) {
- if (!param->data()) // CSP screwed up
+ key)->deriveKey(*ctx, key, creds, owneracl, static_cast<CssmData*>(¶m), usage, attrs, derivedKey);
+
+ CssmKey::Header newHeader;
+ derivedKey->returnKey(*newKey, newHeader);
+
+ if (!copyin(&newHeader, reinterpret_cast<xdrproc_t> (xdr_CSSM_KEYHEADER), keyHeader, keyHeaderLength))
+ CssmError::throwMe(CSSMERR_CSSM_MEMORY_ERROR);
+ Server::releaseWhenDone(*keyHeader);
+
+ if (param.Length) {
+ if (!param.Data) // CSP screwed up
CssmError::throwMe(CSSM_ERRCODE_INTERNAL_ERROR);
- if (paramInputLength) // using incoming buffer; make a copy
- *param = CssmAutoData(Server::csp().allocator(), *param).release();
- OutputData(paramOutput, paramOutputLength) = *param; // return the data
+ OutputData(paramOutput, paramOutputLength) = CssmAutoData(Server::csp().allocator(), param).release();
}
END_IPC(CSP)
}
//
// Random generation
//
-kern_return_t ucsp_server_generateRandom(UCSP_ARGS, uint32 ssid, CONTEXT_ARGS, DATA_OUT(data))
+kern_return_t ucsp_server_generateRandom(UCSP_ARGS, uint32 ssid, DATA_IN(context), DATA_OUT(data))
{
- BEGIN_IPC
- relocate(context, contextBase, attributes, attrSize);
+ BEGIN_IPC(generateRandom)
+ CopyOutContext ctx(context, contextLength);
if (ssid)
CssmError::throwMe(CSSM_ERRCODE_FUNCTION_NOT_IMPLEMENTED);
// default version (use /dev/random)
Allocator &allocator = Allocator::standard(Allocator::sensitive);
- if (size_t bytes = context.getInt(CSSM_ATTRIBUTE_OUTPUT_SIZE)) {
+ if (size_t bytes = ctx.context().getInt(CSSM_ATTRIBUTE_OUTPUT_SIZE)) {
void *buffer = allocator.malloc(bytes);
Server::active().random(buffer, bytes);
*data = buffer;
// Watch out for the memory-management tap-dance.
//
kern_return_t ucsp_server_getOwner(UCSP_ARGS, AclKind kind, KeyHandle key,
- COPY_OUT(AclOwnerPrototype, ownerOut))
+ DATA_OUT(ownerOut))
{
- BEGIN_IPC
+ BEGIN_IPC(getOwner)
AclOwnerPrototype owner;
Server::aclBearer(kind, key).getOwner(owner); // allocates memory in owner
- Copier<AclOwnerPrototype> owners(&owner, Allocator::standard()); // make flat copy
+ void *owners_data; u_int owners_length;
+ if (!::copyin(&owner, reinterpret_cast<xdrproc_t>(xdr_CSSM_ACL_OWNER_PROTOTYPE), &owners_data, &owners_length))
+ CssmError::throwMe(CSSM_ERRCODE_MEMORY_ERROR);
+
{ ChunkFreeWalker free; walk(free, owner); } // release chunked original
- *ownerOutLength = owners.length();
- flips(owners.value(), ownerOut, ownerOutBase);
- Server::releaseWhenDone(owners.keep()); // throw flat copy out when done
+ Server::releaseWhenDone(owners_data); // throw flat copy out when done
+ *ownerOut = owners_data;
+ *ownerOutLength = owners_length;
END_IPC(CSP)
}
kern_return_t ucsp_server_setOwner(UCSP_ARGS, AclKind kind, KeyHandle key,
- COPY_IN(AccessCredentials, cred), COPY_IN(AclOwnerPrototype, owner))
+ DATA_IN(cred), DATA_IN(owner))
{
- BEGIN_IPC
- relocate(cred, credBase, credLength);
- relocate(owner, ownerBase, ownerLength);
- Server::aclBearer(kind, key).changeOwner(*owner, cred);
+ BEGIN_IPC(setOwner)
+ CopyOutAccessCredentials creds(cred, credLength);
+ CopyOutOwnerAcl owneracl(owner, ownerLength);
+ Server::aclBearer(kind, key).changeOwner(*owneracl, creds);
END_IPC(CSP)
}
kern_return_t ucsp_server_getAcl(UCSP_ARGS, AclKind kind, KeyHandle key,
boolean_t haveTag, const char *tag,
- uint32 *countp, COPY_OUT(AclEntryInfo, acls))
+ uint32 *countp, DATA_OUT(acls))
{
- BEGIN_IPC
+ BEGIN_IPC(getAcl)
uint32 count;
AclEntryInfo *aclList;
Server::aclBearer(kind, key).getAcl(haveTag ? tag : NULL, count, aclList);
- *countp = count;
- Copier<AclEntryInfo> aclsOut(aclList, count); // make flat copy
- { // release the chunked memory originals
- ChunkFreeWalker free;
- for (uint32 n = 0; n < count; n++)
- walk(free, aclList[n]);
-
- // release the memory allocated for the list itself when we are done
- Allocator::standard().free (aclList);
- }
+ CSSM_ACL_ENTRY_INFO_ARRAY aclsArray = { count, aclList };
+ void *acls_data; u_int acls_length;
+ if (!::copyin(&aclsArray, reinterpret_cast<xdrproc_t>(xdr_CSSM_ACL_ENTRY_INFO_ARRAY), &acls_data, &acls_length))
+ CssmError::throwMe(CSSM_ERRCODE_MEMORY_ERROR);
- // set result (note: this is *almost* flips(), but on an array)
- *aclsLength = aclsOut.length();
- *acls = *aclsBase = aclsOut;
- if (flipClient()) {
- FlipWalker w;
- for (uint32 n = 0; n < count; n++)
- walk(w, (*acls)[n]);
- w.doFlips();
- Flippers::flip(*aclsBase);
+ { // release the chunked memory originals
+ ChunkFreeWalker free;
+ for (uint32 n = 0; n < count; n++)
+ walk(free, aclList[n]);
+
+ // release the memory allocated for the list itself when we are done
+ Allocator::standard().free (aclList);
}
- Server::releaseWhenDone(aclsOut.keep());
+
+
+ *countp = count; // XXX/cs count becomes part of the blob
+ *aclsLength = acls_length;
+ *acls = acls_data;
+ Server::releaseWhenDone(acls_data);
END_IPC(CSP)
}
kern_return_t ucsp_server_changeAcl(UCSP_ARGS, AclKind kind, KeyHandle key,
- COPY_IN(AccessCredentials, cred), CSSM_ACL_EDIT_MODE mode, CSSM_ACL_HANDLE handle,
- COPY_IN(AclEntryInput, acl))
+ DATA_IN(cred), CSSM_ACL_EDIT_MODE mode, GenericHandle handle,
+ DATA_IN(acl))
{
- BEGIN_IPC
- relocate(cred, credBase, credLength);
- relocate(acl, aclBase, aclLength);
- Server::aclBearer(kind, key).changeAcl(AclEdit(mode, handle, acl), cred);
+ BEGIN_IPC(changeAcl)
+ CopyOutAccessCredentials creds(cred, credLength);
+ CopyOutAclEntryInput entryacl(acl, aclLength);
+
+ Server::aclBearer(kind, key).changeAcl(AclEdit(mode, handle, entryacl), creds);
END_IPC(CSP)
}
//
// Login/Logout
//
-kern_return_t ucsp_server_login(UCSP_ARGS, COPY_IN(AccessCredentials, cred), DATA_IN(name))
+kern_return_t ucsp_server_login(UCSP_ARGS, DATA_IN(cred), DATA_IN(name))
{
- BEGIN_IPC
- relocate(cred, credBase, credLength);
+ BEGIN_IPC(login)
+ CopyOutAccessCredentials creds(cred, credLength);
CssmError::throwMe(CSSM_ERRCODE_FUNCTION_NOT_IMPLEMENTED);
END_IPC(CSP)
}
kern_return_t ucsp_server_logout(UCSP_ARGS)
{
- BEGIN_IPC
+ BEGIN_IPC(logout)
CssmError::throwMe(CSSM_ERRCODE_FUNCTION_NOT_IMPLEMENTED);
END_IPC(CSP)
}
//
// Miscellaneous CSP-related calls
//
-kern_return_t ucsp_server_getStatistics(UCSP_ARGS, uint32 ssid, CSPOperationalStatistics *statistics)
+kern_return_t ucsp_server_getStatistics(UCSP_ARGS, uint32 ssid, CSSM_CSP_OPERATIONAL_STATISTICS *statistics)
{
- BEGIN_IPC
+ BEGIN_IPC(getStatistics)
CssmError::throwMe(CSSM_ERRCODE_FUNCTION_NOT_IMPLEMENTED);
END_IPC(CSP)
}
kern_return_t ucsp_server_getTime(UCSP_ARGS, uint32 ssid, CSSM_ALGORITHMS algorithm, DATA_OUT(data))
{
- BEGIN_IPC
+ BEGIN_IPC(getTime)
CssmError::throwMe(CSSM_ERRCODE_FUNCTION_NOT_IMPLEMENTED);
END_IPC(CSP)
}
kern_return_t ucsp_server_getCounter(UCSP_ARGS, uint32 ssid, DATA_OUT(data))
{
- BEGIN_IPC
+ BEGIN_IPC(getCounter)
CssmError::throwMe(CSSM_ERRCODE_FUNCTION_NOT_IMPLEMENTED);
END_IPC(CSP)
}
kern_return_t ucsp_server_selfVerify(UCSP_ARGS, uint32 ssid)
{
- BEGIN_IPC
+ BEGIN_IPC(selfVerify)
CssmError::throwMe(CSSM_ERRCODE_FUNCTION_NOT_IMPLEMENTED);
END_IPC(CSP)
}
//
// Passthrough calls (separate for CSP and DL passthroughs)
//
-kern_return_t ucsp_server_cspPassThrough(UCSP_ARGS, uint32 ssid, uint32 id, CONTEXT_ARGS,
+kern_return_t ucsp_server_cspPassThrough(UCSP_ARGS, uint32 ssid, uint32 id, DATA_IN(context),
KeyHandle hKey, DATA_IN(inData), DATA_OUT(outData))
{
- BEGIN_IPC
+ BEGIN_IPC(cspPassThrough)
CssmError::throwMe(CSSM_ERRCODE_FUNCTION_NOT_IMPLEMENTED);
END_IPC(CSP)
}
kern_return_t ucsp_server_dlPassThrough(UCSP_ARGS, uint32 ssid, uint32 id,
DATA_IN(inData), DATA_OUT(outData))
{
- BEGIN_IPC
+ BEGIN_IPC(dlPassThrough)
CssmError::throwMe(CSSM_ERRCODE_FUNCTION_NOT_IMPLEMENTED);
END_IPC(DL)
}
// ExtractMasterKey looks vaguely like a key derivation operation, and is in fact
// presented by the CSPDL's CSSM layer as such.
//
-kern_return_t ucsp_server_extractMasterKey(UCSP_ARGS, DbHandle db, CONTEXT_ARGS, DbHandle sourceDb,
- COPY_IN(AccessCredentials, cred), COPY_IN(AclEntryPrototype, owner),
- uint32 usage, uint32 attrs, KeyHandle *newKey, CssmKey::Header *newHeader)
-{
- BEGIN_IPC
- context.postIPC(contextBase, attributes);
- relocate(cred, credBase, credLength);
- relocate(owner, ownerBase, ownerLength);
+kern_return_t ucsp_server_extractMasterKey(UCSP_ARGS, DbHandle db, DATA_IN(context), DbHandle sourceDb,
+ DATA_IN(cred), DATA_IN(owner),
+ uint32 usage, uint32 attrs, KeyHandle *newKey, DATA_OUT(keyHeader))
+{
+ BEGIN_IPC(extractMasterKey)
+ CopyOutAccessCredentials creds(cred, credLength);
+ CopyOutEntryAcl owneracl(owner, ownerLength);
+ CopyOutContext ctx(context, contextLength);
RefPointer<KeychainDatabase> keychain = Server::keychain(sourceDb);
RefPointer<Key> masterKey = keychain->extractMasterKey(
*Server::optionalDatabase(db, attrs & CSSM_KEYATTR_PERMANENT),
- cred, owner, usage, attrs);
- masterKey->returnKey(*newKey, *newHeader);
- flip(*newHeader);
+ creds, owneracl, usage, attrs);
+ CssmKey::Header header;
+ masterKey->returnKey(*newKey, header);
+ if (!copyin(&header, reinterpret_cast<xdrproc_t> (xdr_CSSM_KEYHEADER), keyHeader, keyHeaderLength))
+ CssmError::throwMe(CSSMERR_CSSM_MEMORY_ERROR);
+ Server::releaseWhenDone(*keyHeader);
END_IPC(CSP)
}
// Authorization subsystem support
//
kern_return_t ucsp_server_authorizationCreate(UCSP_ARGS,
- COPY_IN(AuthorizationItemSet, inRights),
+ void *inRights, mach_msg_type_number_t inRightsLength,
uint32 flags,
- COPY_IN(AuthorizationItemSet, inEnvironment),
+ void *inEnvironment, mach_msg_type_number_t inEnvironmentLength,
AuthorizationBlob *authorization)
{
- BEGIN_IPC
- relocate(inRights, inRightsBase, inRightsLength);
- relocate(inEnvironment, inEnvironmentBase, inEnvironmentLength);
- Authorization::AuthItemSet rights(inRights), environment(inEnvironment);
+ BEGIN_IPC(authorizationCreate)
+ AuthorizationItemSet *authrights = NULL, *authenvironment = NULL;
+
+ if (inRights && !copyout_AuthorizationItemSet(inRights, inRightsLength, &authrights))
+ {
+ Syslog::alert("ucsp_server_authorizationCreate(): error converting 'rights' input");
+ CssmError::throwMe(errAuthorizationInternal); // allocation error probably
+ }
+
+ if (inEnvironment && !copyout_AuthorizationItemSet(inEnvironment, inEnvironmentLength, &authenvironment))
+ {
+ free(authrights);
+ Syslog::alert("ucsp_server_authorizationCreate(): error converting 'environment' input");
+ CssmError::throwMe(errAuthorizationInternal); // allocation error probably
+ }
+
+ Authorization::AuthItemSet rights(authrights), environment(authenvironment);
*rcode = connection.process().session().authCreate(rights, environment,
flags, *authorization, auditToken);
+
+ // @@@ safe-guard against code throw()ing in here
+
+ if (authrights)
+ free(authrights);
+
+ if (authenvironment)
+ free(authenvironment);
+
END_IPC(CSSM)
}
kern_return_t ucsp_server_authorizationRelease(UCSP_ARGS,
AuthorizationBlob authorization, uint32 flags)
{
- BEGIN_IPC
+ BEGIN_IPC(authorizationRelease)
connection.process().session().authFree(authorization, flags);
END_IPC(CSSM)
}
kern_return_t ucsp_server_authorizationCopyRights(UCSP_ARGS,
AuthorizationBlob authorization,
- COPY_IN(AuthorizationItemSet, inRights),
+ void *inRights, mach_msg_type_number_t inRightsLength,
uint32 flags,
- COPY_IN(AuthorizationItemSet, inEnvironment),
- COPY_OUT(AuthorizationItemSet, result))
-{
- BEGIN_IPC
- relocate(inRights, inRightsBase, inRightsLength);
- relocate(inEnvironment, inEnvironmentBase, inEnvironmentLength);
- Authorization::AuthItemSet rights(inRights), environment(inEnvironment), grantedRights;
- *rcode = connection.process().session().authGetRights(authorization,
- rights, environment, flags, grantedRights);
+ void *inEnvironment, mach_msg_type_number_t inEnvironmentLength,
+ void **result, mach_msg_type_number_t *resultLength)
+{
+ BEGIN_IPC(authorizationCopyRights)
+ AuthorizationItemSet *authrights = NULL, *authenvironment = NULL;
+
+ if (inRights && !copyout_AuthorizationItemSet(inRights, inRightsLength, &authrights))
+ {
+ Syslog::alert("ucsp_server_authorizationCopyRights(): error converting 'rights' input");
+ CssmError::throwMe(errAuthorizationInternal); // allocation error probably
+ }
+ if (inEnvironment && !copyout_AuthorizationItemSet(inEnvironment, inEnvironmentLength, &authenvironment))
+ {
+ free(authrights);
+ Syslog::alert("ucsp_server_authorizationCopyRights(): error converting 'environment' input");
+ CssmError::throwMe(errAuthorizationInternal); // allocation error probably
+ }
+
+ Authorization::AuthItemSet rights(authrights), environment(authenvironment), grantedRights;
+ *rcode = Session::authGetRights(authorization, rights, environment, flags, grantedRights);
+
+ // @@@ safe-guard against code throw()ing in here
+
+ if (authrights)
+ free(authrights);
+
+ if (authenvironment)
+ free(authenvironment);
+
if (result && resultLength)
{
- size_t resultSize;
- grantedRights.copy(*result, resultSize);
- *resultLength = resultSize;
- *resultBase = *result;
- flips(*result, result, resultBase);
+ AuthorizationItemSet *copyout = grantedRights.copy();
+ if (!copyin_AuthorizationItemSet(copyout, result, resultLength))
+ {
+ free(copyout);
+ Syslog::alert("ucsp_server_authorizationCopyRights(): error packaging return information");
+ CssmError::throwMe(errAuthorizationInternal);
+ }
+ free(copyout);
Server::releaseWhenDone(*result);
}
END_IPC(CSSM)
kern_return_t ucsp_server_authorizationCopyInfo(UCSP_ARGS,
AuthorizationBlob authorization,
AuthorizationString tag,
- COPY_OUT(AuthorizationItemSet, info))
+ void **info, mach_msg_type_number_t *infoLength)
{
- BEGIN_IPC
+ BEGIN_IPC(authorizationCopyInfo)
Authorization::AuthItemSet infoSet;
- *info = *infoBase = NULL;
+ *info = NULL;
*infoLength = 0;
*rcode = connection.process().session().authGetInfo(authorization,
tag[0] ? tag : NULL, infoSet);
- if (*rcode == noErr) {
- size_t infoSize;
- infoSet.copy(*info, infoSize);
- *infoLength = infoSize;
- *infoBase = *info;
- flips(*info, info, infoBase);
+ if (*rcode == noErr)
+ {
+ AuthorizationItemSet *copyout = infoSet.copy();
+ if (!copyin_AuthorizationItemSet(copyout, info, infoLength))
+ {
+ free(copyout);
+ Syslog::alert("ucsp_server_authorizationCopyInfo(): error packaging return information");
+ CssmError::throwMe(errAuthorizationInternal);
+ }
+ free(copyout);
Server::releaseWhenDone(*info);
}
END_IPC(CSSM)
kern_return_t ucsp_server_authorizationExternalize(UCSP_ARGS,
AuthorizationBlob authorization, AuthorizationExternalForm *extForm)
{
- BEGIN_IPC
+ BEGIN_IPC(authorizationExternalize)
*rcode = connection.process().session().authExternalize(authorization, *extForm);
END_IPC(CSSM)
}
kern_return_t ucsp_server_authorizationInternalize(UCSP_ARGS,
AuthorizationExternalForm extForm, AuthorizationBlob *authorization)
{
- BEGIN_IPC
+ BEGIN_IPC(authorizationInternalize)
*rcode = connection.process().session().authInternalize(extForm, *authorization);
END_IPC(CSSM)
}
//
// Session management subsystem
//
-kern_return_t ucsp_server_getSessionInfo(UCSP_ARGS,
- SecuritySessionId *sessionId, SessionAttributeBits *attrs)
-{
- BEGIN_IPC
- Session &session = Session::find(*sessionId);
- *sessionId = session.handle();
- *attrs = session.attributes();
- END_IPC(CSSM)
-}
-
-kern_return_t ucsp_server_setupSession(UCSP_ARGS,
- SessionCreationFlags flags, SessionAttributeBits attrs)
-{
- BEGIN_IPC
- Server::process().session().setupAttributes(flags, attrs);
- END_IPC(CSSM)
-}
-
-kern_return_t ucsp_server_setSessionDistinguishedUid(UCSP_ARGS,
- SecuritySessionId sessionId, uid_t user)
-{
- BEGIN_IPC
- Session::find<DynamicSession>(sessionId).originatorUid(user);
- END_IPC(CSSM)
-}
-
-kern_return_t ucsp_server_getSessionDistinguishedUid(UCSP_ARGS,
- SecuritySessionId sessionId, uid_t *user)
-{
- BEGIN_IPC
- *user = Session::find(sessionId).originatorUid();
- END_IPC(CSSM)
-}
-
kern_return_t ucsp_server_setSessionUserPrefs(UCSP_ARGS, SecuritySessionId sessionId, DATA_IN(userPrefs))
{
- BEGIN_IPC
+ BEGIN_IPC(setSessionuserPrefs)
CFRef<CFDataRef> data(CFDataCreate(NULL, (UInt8 *)userPrefs, userPrefsLength));
if (!data)
}
-
//
// Notification core subsystem
//
-kern_return_t ucsp_server_requestNotification(UCSP_ARGS, mach_port_t receiver, uint32 domain, uint32 events)
-{
- BEGIN_IPC
- connection.process().requestNotifications(receiver, domain, events);
- END_IPC(CSSM)
-}
-kern_return_t ucsp_server_stopNotification(UCSP_ARGS, mach_port_t receiver)
+kern_return_t ucsp_server_postNotification(UCSP_ARGS, uint32 domain, uint32 event,
+ DATA_IN(data), uint32 sequence)
{
- BEGIN_IPC
- connection.process().stopNotifications(receiver);
- END_IPC(CSSM)
-}
-
-kern_return_t ucsp_server_postNotification(mach_port_t serverPort, uint32 domain, uint32 event, DATA_IN(data))
-{
- BEGIN_IPCS
- Listener::notify(domain, event, DATA(data));
- END_IPCS()
+ BEGIN_IPC(postNotification)
+ Listener::notify(domain, event, sequence, DATA(data));
+ END_IPC(CSSM)
}
//
kern_return_t ucsp_server_authorizationdbGet(UCSP_ARGS, const char *rightname, DATA_OUT(rightDefinition))
{
- BEGIN_IPC
+ BEGIN_IPC(authorizationdbGet)
CFDictionaryRef rightDict;
*rcode = connection.process().session().authorizationdbGet(rightname, &rightDict);
CFRef<CFDataRef> data(CFPropertyListCreateXMLData (NULL, rightDict));
CFRelease(rightDict);
if (!data)
+ {
+ Syslog::alert("ucsp_server_authorizationGet(): unable to make XML version of right definition for '%s'", rightname);
return errAuthorizationInternal;
+ }
// @@@ copy data to avoid having to do a delayed cfrelease
mach_msg_type_number_t length = CFDataGetLength(data);
kern_return_t ucsp_server_authorizationdbSet(UCSP_ARGS, AuthorizationBlob authorization, const char *rightname, DATA_IN(rightDefinition))
{
- BEGIN_IPC
+ BEGIN_IPC(authorizationdbSet)
CFRef<CFDataRef> data(CFDataCreate(NULL, (UInt8 *)rightDefinition, rightDefinitionLength));
if (!data)
+ {
+ Syslog::alert("ucsp_server_authorizationSet(): CFDataCreate() error");
return errAuthorizationInternal;
+ }
CFRef<CFDictionaryRef> rightDefinition(static_cast<CFDictionaryRef>(CFPropertyListCreateFromXMLData(NULL, data, kCFPropertyListImmutable, NULL)));
if (!rightDefinition || (CFGetTypeID(rightDefinition) != CFDictionaryGetTypeID()))
+ {
+ Syslog::alert("ucsp_server_authorizationSet(): error converting XML right definition for '%s' to property list", rightname);
return errAuthorizationInternal;
+ }
*rcode = connection.process().session().authorizationdbSet(authorization, rightname, rightDefinition);
kern_return_t ucsp_server_authorizationdbRemove(UCSP_ARGS, AuthorizationBlob authorization, const char *rightname)
{
- BEGIN_IPC
+ BEGIN_IPC(authorizationdbRemove)
*rcode = connection.process().session().authorizationdbRemove(authorization, rightname);
END_IPC(CSSM)
}
kern_return_t ucsp_server_addCodeEquivalence(UCSP_ARGS, DATA_IN(oldHash), DATA_IN(newHash),
const char *name, boolean_t forSystem)
{
- BEGIN_IPC
+ BEGIN_IPC(addCodeEquivalence)
Server::codeSignatures().addLink(DATA(oldHash), DATA(newHash), name, forSystem);
END_IPC(CSSM)
}
kern_return_t ucsp_server_removeCodeEquivalence(UCSP_ARGS, DATA_IN(hash),
const char *name, boolean_t forSystem)
{
- BEGIN_IPC
+ BEGIN_IPC(removeCodeEquivalence)
Server::codeSignatures().removeLink(DATA(hash), name, forSystem);
END_IPC(CSSM)
}
kern_return_t ucsp_server_setAlternateSystemRoot(UCSP_ARGS, const char *root)
{
- BEGIN_IPC
+ BEGIN_IPC(setAlternateSystemRoot)
#if defined(NDEBUG)
if (connection.process().uid() != 0)
CssmError::throwMe(CSSM_ERRCODE_OS_ACCESS_DENIED);
mach_port_t servicePort, mach_port_t taskPort)
{
BEGIN_IPCS
- ServerChild::checkIn(servicePort, TaskPort(taskPort).pid());
+ ServerChild::checkIn(servicePort, TaskPort(taskPort).pid());
END_IPCS(mach_port_deallocate(mach_task_self(), taskPort))
}
+
+
+//
+// Code Signing Hosting registration.
+// Note that the Code Signing Proxy facility (implementing the "cshosting"
+// IPC protocol) is elsewhere.
+//
+kern_return_t ucsp_server_registerHosting(UCSP_ARGS, mach_port_t hostingPort, uint32 flags)
+{
+ BEGIN_IPC(registerHosting)
+ connection.process().registerCodeSigning(hostingPort, flags);
+ END_IPC(CSSM)
+}
+
+kern_return_t ucsp_server_hostingPort(UCSP_ARGS, pid_t hostPid, mach_port_t *hostingPort)
+{
+ BEGIN_IPC(hostingPort)
+ if (RefPointer<Process> process = Server::active().findPid(hostPid))
+ *hostingPort = process->hostingPort();
+ else
+ *hostingPort = MACH_PORT_NULL;
+ secdebug("hosting", "hosting port for for pid=%d is port %d", hostPid, *hostingPort);
+ END_IPC(CSSM)
+}
+
+
+kern_return_t ucsp_server_setGuest(UCSP_ARGS, SecGuestRef guest, SecCSFlags flags)
+{
+ BEGIN_IPC(setGuest)
+ connection.guestRef(guest, flags);
+ END_IPC(CSSM)
+}
+
+
+kern_return_t ucsp_server_createGuest(UCSP_ARGS, SecGuestRef host,
+ uint32_t status, const char *path, DATA_IN(cdhash), DATA_IN(attributes),
+ SecCSFlags flags, SecGuestRef *newGuest)
+{
+ BEGIN_IPC(createGuest)
+ *newGuest = connection.process().createGuest(host, status, path, DATA(cdhash), DATA(attributes), flags);
+ END_IPC(CSSM)
+}
+
+kern_return_t ucsp_server_setGuestStatus(UCSP_ARGS, SecGuestRef guest,
+ uint32_t status, DATA_IN(attributes))
+{
+ BEGIN_IPC(setGuestStatus)
+ connection.process().setGuestStatus(guest, status, DATA(attributes));
+ END_IPC(CSSM)
+}
+
+kern_return_t ucsp_server_removeGuest(UCSP_ARGS, SecGuestRef host, SecGuestRef guest)
+{
+ BEGIN_IPC(removeGuest)
+ connection.process().removeGuest(host, guest);
+ END_IPC(CSSM)
+}
+
+kern_return_t ucsp_server_helpCheckLoad(UCSP_ARGS, const char path[PATH_MAX], uint32_t type)
+{
+ BEGIN_IPC(helpCheckLoad)
+ END_IPC(CSSM)
+}
projects / apple / securityd.git / blobdiff