Security-59754.80.3.tar.gz

[apple/security.git] / securityd / src / token.cpp

diff --git a/securityd/src/token.cpp b/securityd/src/token.cpp
index 4dc47dfab6fe588a759e4985d834487b06c16f97..f6aaaf054ef70a226e49bccbc03a2da7ca3ea7dd 100644 (file)
--- a/securityd/src/token.cpp
+++ b/securityd/src/token.cpp
@@ -61,13 +61,13 @@ Mutex Token::mSSIDLock;
 Token::Token()
        : mFaulted(false), mTokend(NULL), mResetLevel(1)
 {
 Token::Token()
        : mFaulted(false), mTokend(NULL), mResetLevel(1)
 {

-       secdebug("token", "%p created", this);
+       secinfo("token", "%p created", this);

 }
 
 
 Token::~Token()
 {
 }
 
 
 Token::~Token()
 {

-       secdebug("token", "%p (%s:%d) destroyed",
+       secinfo("token", "%p (%s:%d) destroyed",

                this, mGuid.toString().c_str(), mSubservice);
 }
 
                this, mGuid.toString().c_str(), mSubservice);
 }
 


@@ -170,7 +170,7 @@ void Token::resetAcls()
        {
                StLock<Mutex> _(*this);
                mResetLevel++;
        {
                StLock<Mutex> _(*this);
                mResetLevel++;

-               secdebug("token", "%p reset (level=%d, propagating to %ld common(s)",
+               secinfo("token", "%p reset (level=%d, propagating to %ld common(s)",

                        this, mResetLevel, mCommons.size());
                // Make a copy to avoid deadlock with TokenDbCommon lock
                tmpCommons = mCommons;
                        this, mResetLevel, mCommons.size());
                // Make a copy to avoid deadlock with TokenDbCommon lock
                tmpCommons = mCommons;


@@ -181,13 +181,13 @@ void Token::resetAcls()
 
 void Token::addCommon(TokenDbCommon &dbc)
 {
 
 void Token::addCommon(TokenDbCommon &dbc)
 {

-       secdebug("token", "%p addCommon TokenDbCommon %p", this, &dbc);
+       secinfo("token", "%p addCommon TokenDbCommon %p", this, &dbc);

        mCommons.insert(&dbc);
 }
 
 void Token::removeCommon(TokenDbCommon &dbc)
 {
        mCommons.insert(&dbc);
 }
 
 void Token::removeCommon(TokenDbCommon &dbc)
 {

-       secdebug("token", "%p removeCommon TokenDbCommon %p", this, &dbc);
+       secinfo("token", "%p removeCommon TokenDbCommon %p", this, &dbc);

        if (mCommons.find(&dbc) != mCommons.end())
                mCommons.erase(&dbc);
 }
        if (mCommons.find(&dbc) != mCommons.end())
                mCommons.erase(&dbc);
 }


@@ -211,7 +211,7 @@ void Token::insert(::Reader &slot, RefPointer<TokenDaemon> tokend)
                if (tokend == NULL) {
                        // no pre-determined Tokend - search for one
                        if (!(tokend = chooseTokend())) {
                if (tokend == NULL) {
                        // no pre-determined Tokend - search for one
                        if (!(tokend = chooseTokend())) {

-                               secdebug("token", "%p no token daemons available - faulting this card", this);
+                               secinfo("token", "%p no token daemons available - faulting this card", this);

                                fault(false);   // throws
                        }
                }
                                fault(false);   // throws
                        }
                }


@@ -220,7 +220,7 @@ void Token::insert(::Reader &slot, RefPointer<TokenDaemon> tokend)
                StLock<Mutex> _(*this);
 
                Syslog::debug("token inserted into reader %s", slot.name().c_str());
                StLock<Mutex> _(*this);
 
                Syslog::debug("token inserted into reader %s", slot.name().c_str());

-               secdebug("token", "%p begin insertion into slot %p (reader %s)",
+               secinfo("token", "%p begin insertion into slot %p (reader %s)",

                        this, &slot, slot.name().c_str());
                
                // tell the tokend object to relay faults to us
                        this, &slot, slot.name().c_str());
                
                // tell the tokend object to relay faults to us


@@ -228,16 +228,16 @@ void Token::insert(::Reader &slot, RefPointer<TokenDaemon> tokend)
 
                // locate or establish cache directories
                if (tokend->hasTokenUid()) {
 
                // locate or establish cache directories
                if (tokend->hasTokenUid()) {

-                       secdebug("token", "%p using %s (score=%d, uid=\"%s\")",
+                       secinfo("token", "%p using %s (score=%d, uid=\"%s\")",

                                this, tokend->bundlePath().c_str(), tokend->score(), tokend->tokenUid().c_str());
                        mCache = new TokenCache::Token(reader().cache,
                                tokend->bundleIdentifier() + ":" + tokend->tokenUid());
                } else {
                                this, tokend->bundlePath().c_str(), tokend->score(), tokend->tokenUid().c_str());
                        mCache = new TokenCache::Token(reader().cache,
                                tokend->bundleIdentifier() + ":" + tokend->tokenUid());
                } else {

-                       secdebug("token", "%p using %s (score=%d, temporary)",
+                       secinfo("token", "%p using %s (score=%d, temporary)",

                                this, tokend->bundlePath().c_str(), tokend->score());
                        mCache = new TokenCache::Token(reader().cache);
                }
                                this, tokend->bundlePath().c_str(), tokend->score());
                        mCache = new TokenCache::Token(reader().cache);
                }

-               secdebug("token", "%p token cache at %s", this, mCache->root().c_str());
+               secinfo("token", "%p token cache at %s", this, mCache->root().c_str());

                
                // here's the primary parameters of the new subservice
                mGuid = gGuidAppleSdCSPDL;
                
                // here's the primary parameters of the new subservice
                mGuid = gGuidAppleSdCSPDL;


@@ -267,7 +267,7 @@ void Token::insert(::Reader &slot, RefPointer<TokenDaemon> tokend)
                        mCache->printName(mPrintName);          // store in cache
 
                // install MDS
                        mCache->printName(mPrintName);          // store in cache
 
                // install MDS

-               secdebug("token", "%p installing MDS from %s(%s)", this,
+               secinfo("token", "%p installing MDS from %s(%s)", this,

                        tokend->bundlePath().c_str(),
                        mdsDirectory[0] ? mdsDirectory : "ALL");
                string holdGuid = mGuid.toString();     // extend lifetime of std::string
                        tokend->bundlePath().c_str(),
                        mdsDirectory[0] ? mdsDirectory : "ALL");
                string holdGuid = mGuid.toString();     // extend lifetime of std::string


@@ -299,19 +299,19 @@ void Token::insert(::Reader &slot, RefPointer<TokenDaemon> tokend)
 
                notify(kNotificationCDSAInsertion);
                
 
                notify(kNotificationCDSAInsertion);
                

-               Syslog::notice("reader %s inserted token \"%s\" (%s) subservice %ld using driver %s",
+               Syslog::notice("reader %s inserted token \"%s\" (%s) subservice %d using driver %s",

                        slot.name().c_str(), mPrintName.c_str(),
                        mTokend->hasTokenUid() ? mTokend->tokenUid().c_str() : "NO UID",
                        mSubservice, mTokend->bundleIdentifier().c_str());
                        slot.name().c_str(), mPrintName.c_str(),
                        mTokend->hasTokenUid() ? mTokend->tokenUid().c_str() : "NO UID",
                        mSubservice, mTokend->bundleIdentifier().c_str());

-               secdebug("token", "%p inserted as %s:%d", this, mGuid.toString().c_str(), mSubservice);
+               secinfo("token", "%p inserted as %s:%d", this, mGuid.toString().c_str(), mSubservice);

        } catch (const CommonError &err) {
        } catch (const CommonError &err) {

-               Syslog::notice("token in reader %s cannot be used (error %ld)", slot.name().c_str(), err.osStatus());
-               secdebug("token", "exception during insertion processing");
+               Syslog::notice("token in reader %s cannot be used (error %d)", slot.name().c_str(), err.osStatus());
+               secinfo("token", "exception during insertion processing");

                fault(false);
        } catch (...) {
                // exception thrown during insertion processing. Mark faulted
                Syslog::notice("token in reader %s cannot be used", slot.name().c_str());
                fault(false);
        } catch (...) {
                // exception thrown during insertion processing. Mark faulted
                Syslog::notice("token in reader %s cannot be used", slot.name().c_str());

-               secdebug("token", "exception during insertion processing");
+               secinfo("token", "exception during insertion processing");

                fault(false);
        }
 }
                fault(false);
        }
 }


@@ -331,22 +331,22 @@ void Token::insert(::Reader &slot, RefPointer<TokenDaemon> tokend)
 void Token::remove()
 {
        StLock<Mutex> _(*this);
 void Token::remove()
 {
        StLock<Mutex> _(*this);

-       Syslog::notice("reader %s removed token \"%s\" (%s) subservice %ld",
+       Syslog::notice("reader %s removed token \"%s\" (%s) subservice %d",

                        reader().name().c_str(), mPrintName.c_str(),
                        mTokend
                                ? (mTokend->hasTokenUid() ? mTokend->tokenUid().c_str() : "NO UID")
                                : "NO tokend",
                        mSubservice);
                        reader().name().c_str(), mPrintName.c_str(),
                        mTokend
                                ? (mTokend->hasTokenUid() ? mTokend->tokenUid().c_str() : "NO UID")
                                : "NO tokend",
                        mSubservice);

-       secdebug("token", "%p begin removal from slot %p (reader %s)",
+       secinfo("token", "%p begin removal from slot %p (reader %s)",

                this, &reader(), reader().name().c_str());
        if (mTokend)
                mTokend->faultRelay(NULL);              // unregister (no more faults, please)
        mds().uninstall(mGuid.toString().c_str(), mSubservice);
                this, &reader(), reader().name().c_str());
        if (mTokend)
                mTokend->faultRelay(NULL);              // unregister (no more faults, please)
        mds().uninstall(mGuid.toString().c_str(), mSubservice);

-       secdebug("token", "%p mds uninstall complete", this);
+       secinfo("token", "%p mds uninstall complete", this);

        this->kill();
        this->kill();

-       secdebug("token", "%p kill complete", this);
+       secinfo("token", "%p kill complete", this);

        notify(kNotificationCDSARemoval);
        notify(kNotificationCDSARemoval);

-       secdebug("token", "%p removal complete", this);
+       secinfo("token", "%p removal complete", this);

 }
 
 
 }
 
 


@@ -363,7 +363,7 @@ void Token::fault(bool async)
 {
        StLock<Mutex> _(*this);
        if (!mFaulted) {        // first one
 {
        StLock<Mutex> _(*this);
        if (!mFaulted) {        // first one

-               secdebug("token", "%p %s FAULT", this, async ? "ASYNCHRONOUS" : "SYNCHRONOUS");
+               secinfo("token", "%p %s FAULT", this, async ? "ASYNCHRONOUS" : "SYNCHRONOUS");

                
                // mark faulted
                mFaulted = true;
                
                // mark faulted
                mFaulted = true;


@@ -383,7 +383,7 @@ void Token::fault(bool async)
 
 void Token::relayFault(bool async)
 {
 
 void Token::relayFault(bool async)
 {

-       secdebug("token", "%p fault relayed from tokend", this);
+       secinfo("token", "%p fault relayed from tokend", this);

        this->fault(async);
 }
 
        this->fault(async);
 }
 


@@ -435,7 +435,6 @@ void Token::notify(NotificationEvent event)
     free (data.data());
 }
 
     free (data.data());
 }
 

-

 //
 // Choose a token daemon for our card.
 //
 //
 // Choose a token daemon for our card.
 //


@@ -451,6 +450,8 @@ RefPointer<TokenDaemon> Token::chooseTokend()
        candidates.update();
        //@@@ we could sort by reverse "maxScore" and avoid launching those who won't cut it anyway...
        
        candidates.update();
        //@@@ we could sort by reverse "maxScore" and avoid launching those who won't cut it anyway...
        

+       string chosenIdentifier;
+       set<string> candidateIdentifiers;

        RefPointer<TokenDaemon> leader;
        for (CodeRepository<Bundle>::const_iterator it = candidates.begin();
                        it != candidates.end(); it++) {
        RefPointer<TokenDaemon> leader;
        for (CodeRepository<Bundle>::const_iterator it = candidates.begin();
                        it != candidates.end(); it++) {


@@ -465,6 +466,9 @@ RefPointer<TokenDaemon> Token::chooseTokend()
                        RefPointer<TokenDaemon> tokend = new TokenDaemon(candidate,
                                reader().name(), reader().pcscState(), reader().cache);
                        
                        RefPointer<TokenDaemon> tokend = new TokenDaemon(candidate,
                                reader().name(), reader().pcscState(), reader().cache);
                        

+                       // add identifier to candidate names set
+                       candidateIdentifiers.insert(tokend->bundleIdentifier());
+

                        if (tokend->state() == ServerChild::dead)       // ah well, this one's no good
                                continue;
                        
                        if (tokend->state() == ServerChild::dead)       // ah well, this one's no good
                                continue;
                        


@@ -473,12 +477,23 @@ RefPointer<TokenDaemon> Token::chooseTokend()
                                continue;
 
                        // we got a contender!
                                continue;
 
                        // we got a contender!

-                       if (!leader || tokend->score() > leader->score())
+                       if (!leader || tokend->score() > leader->score()) {

                                leader = tokend;                // a new front runner, he is...
                                leader = tokend;                // a new front runner, he is...

+                               chosenIdentifier = leader->bundleIdentifier();
+                       }

                } catch (...) {
                } catch (...) {

-                       secdebug("token", "exception setting up %s (moving on)", candidate->canonicalPath().c_str());
+                       secinfo("token", "exception setting up %s (moving on)", candidate->canonicalPath().c_str());

                }
        }
                }
        }

+
+       // concatenate all candidate identifiers (sorted internally inside std::set)
+       string identifiers;
+       for (set<string>::const_iterator i = candidateIdentifiers.begin(), e = candidateIdentifiers.end(); i != e; ++i) {
+               if (i != candidateIdentifiers.begin())
+                       identifiers.append(";");
+               identifiers.append(*i);
+       }
+

        return leader;
 }
 
        return leader;
 }