javacommons/security/javasrc/com/nokia/mj/impl/security/midp/authorization/PermissionResolver.java
changeset 64 0ea12c182930
parent 50 023eef975703
child 66 2455ef1f5bbc
child 78 71ad690e91f5
equal deleted inserted replaced
57:59b3b4473dc8 64:0ea12c182930
   201                         .equals(newSettings.getName()))
   201                         .equals(newSettings.getName()))
   202                 {
   202                 {
   203                     // add new settings
   203                     // add new settings
   204                     newPermissionInstancesAndSettings.addElement(
   204                     newPermissionInstancesAndSettings.addElement(
   205                         new PermisionInstanceAndSettings(
   205                         new PermisionInstanceAndSettings(
   206                             p.getPermissionInstance(), 
   206                             p.getPermissionInstance(),
   207                             p.getType(),
   207                             p.getType(),
   208                             newSettings));
   208                             newSettings));
   209                 }
   209                 }
   210                 else
   210                 else
   211                 {
   211                 {
   676                     // choose the target: if the target does not include wildcards,
   676                     // choose the target: if the target does not include wildcards,
   677                     // then there must be an exact match between the requested
   677                     // then there must be an exact match between the requested
   678                     // permission and the policy permission
   678                     // permission and the policy permission
   679                     String target = legacyPermission.getTarget();
   679                     String target = legacyPermission.getTarget();
   680                     if (target != null
   680                     if (target != null
   681                             && target.indexOf("*") == -1
   681                         && !("*".equals(policyPermissions[i].getTarget()))
   682                             && !target.equals(policyPermissions[i].getTarget()))
   682                         && !target.equals(policyPermissions[i].getTarget()))
   683                     {
   683                     {
   684                         continue;
   684                         continue;
       
   685                     }
       
   686                     if (target == null)
       
   687                     {
       
   688                         target = policyPermissions[i].getTarget();
   685                     }
   689                     }
   686                     // choose the action
   690                     // choose the action
   687                     String actionList = legacyPermission.getActionList();
   691                     String actionList = legacyPermission.getActionList();
   688                     if (actionList == null)
   692                     if (actionList == null)
   689                     {
   693                     {
   690                         resolvedPermissions.addElement(
   694                         resolvedPermissions.addElement(
   691                             new PolicyBasedPermissionImpl(
   695                             new PolicyBasedPermissionImpl(
   692                                 policyPermissions[i].getName(),
   696                                 policyPermissions[i].getName(),
   693                                 policyPermissions[i].getTarget(),
   697                                 target,
   694                                 policyPermissions[i].getActionList(),
   698                                 policyPermissions[i].getActionList(),
   695                                 policyPermissions[i].getUserSecuritySettings()));
   699                                 policyPermissions[i].getUserSecuritySettings()));
   696                     }
   700                     }
   697                     else
   701                     else
   698                     {
   702                     {
   700                                                         policyPermissions[i].getActionList()))
   704                                                         policyPermissions[i].getActionList()))
   701                         {
   705                         {
   702                             resolvedPermissions.addElement(
   706                             resolvedPermissions.addElement(
   703                                 new PolicyBasedPermissionImpl(
   707                                 new PolicyBasedPermissionImpl(
   704                                     policyPermissions[i].getName(),
   708                                     policyPermissions[i].getName(),
   705                                     policyPermissions[i].getTarget(),
   709                                     target,
   706                                     actionList,
   710                                     actionList,
   707                                     policyPermissions[i].getUserSecuritySettings()));
   711                                     policyPermissions[i].getUserSecuritySettings()));
   708                         }
   712                         }
   709                     }
   713                     }
   710                 }
   714                 }
   733 
   737 
   734         public UserSecuritySettings getSettings()
   738         public UserSecuritySettings getSettings()
   735         {
   739         {
   736             return settings;
   740             return settings;
   737         }
   741         }
   738         
   742 
   739         public int getType()
   743         public int getType()
   740         {
   744         {
   741             return type;
   745             return type;
   742         }
   746         }
   743     }
   747     }