Add rule for 'All devices apps' when access rule is empty.

Signed-off-by: Ji-hoon Jung <jh8801.jung@samsung.com>
Change-Id: I56cd5bb1c3f7b7ea967c623803c2e95e97716ffa

diff --git a/common/AccessCondition.cpp b/common/AccessCondition.cpp
index d6831c8..563da7d 100644 (file)
--- a/common/AccessCondition.cpp
+++ b/common/AccessCondition.cpp
@@ -105,13 +105,29 @@ namespace smartcard_service_api
                mapRules.insert(item);
        }
 
+       void AccessCondition::setAccessCondition(bool rule)
+       {
+               AccessRule *result;
+
+               result = getAccessRule(AccessControlList::ALL_DEVICE_APPS);
+               if (result == NULL) {
+                       addAccessRule(AccessControlList::ALL_DEVICE_APPS);
+                       result = getAccessRule(AccessControlList::ALL_DEVICE_APPS);
+                       if (result == NULL)
+                               return;
+               }
+
+               result->setAPDUAccessRule(rule);
+               result->setNFCAccessRule(rule);
+       }
+
        bool AccessCondition::isAuthorizedAccess(const ByteArray &certHash) const
        {
-               bool result = permission;
+               bool result = false;
                const AccessRule *rule = getAccessRule(certHash);
 
                if (rule != NULL) {
-                       result = true;
+                       result = rule->isAuthorizedAccess();
                }
 
                return result;

diff --git a/common/include/AccessCondition.h b/common/include/AccessCondition.h
index 5ab978d..689eacd 100644 (file)
--- a/common/include/AccessCondition.h
+++ b/common/include/AccessCondition.h
@@ -55,16 +55,15 @@ namespace smartcard_service_api
        class AccessCondition
        {
        private :
-               bool permission;
                ByteArray aid;
                map<ByteArray, AccessRule> mapRules;
 
        public :
-               AccessCondition() : permission(false) {}
+               AccessCondition() {}
 
                inline void setAID(const ByteArray &aid) { this->aid = aid; }
                inline const ByteArray getAID() const { return aid; }
-               inline void setAccessCondition(bool rule) { permission = rule; }
+               void setAccessCondition(bool rule);
                void addAccessRule(const ByteArray &hash);
 
                void setAPDUAccessRule(const ByteArray &certHash, bool rule);