Merge "Sonar fixes related to exceptions"

[aaf/authz.git] / auth / auth-deforg / src / main / java / org / onap / aaf / org / DefaultOrg.java

diff --git a/auth/auth-deforg/src/main/java/org/onap/aaf/org/DefaultOrg.java b/auth/auth-deforg/src/main/java/org/onap/aaf/org/DefaultOrg.java
index 3d42b63..b36c6f2 100644 (file)
--- a/auth/auth-deforg/src/main/java/org/onap/aaf/org/DefaultOrg.java
+++ b/auth/auth-deforg/src/main/java/org/onap/aaf/org/DefaultOrg.java
@@ -21,7 +21,8 @@
  ******************************************************************************/
 package org.onap.aaf.org;
 
-import java.io.*;
+import java.io.File;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.GregorianCalendar;
@@ -61,7 +62,7 @@ public class DefaultOrg implements Organization {
        public DefaultOrg(Env env, String realm) throws OrganizationException {
 
                this.realm = realm;
-               supportedRealms=new HashSet<String>();
+               supportedRealms=new HashSet<>();
                supportedRealms.add(realm);
                domain=FQI.reverseDomain(realm);
                atDomain = '@'+domain;
@@ -125,7 +126,7 @@ public class DefaultOrg implements Organization {
        }
 
        // Implement your own Delegation System
-       static final List<String> NULL_DELEGATES = new ArrayList<String>();
+       static final List<String> NULL_DELEGATES = new ArrayList<>();
 
        public Identities identities;
        private boolean dryRun;
@@ -134,7 +135,7 @@ public class DefaultOrg implements Organization {
        private final static Set<String> typeSet;
 
        static {
-               typeSet = new HashSet<String>();
+               typeSet = new HashSet<>();
                for(Types t : Types.values()) {
                        typeSet.add(t.name());
                }
@@ -160,7 +161,6 @@ public class DefaultOrg implements Organization {
        @Override
        public DefaultOrgIdentity getIdentity(AuthzTrans trans, String id) throws OrganizationException {
                int at = id.indexOf('@');
-               String attt = at<0?id:id.substring(0, at);
                return new DefaultOrgIdentity(trans,at<0?id:id.substring(0, at),this);
        }
 
@@ -203,14 +203,27 @@ public class DefaultOrg implements Organization {
        }
 
        private static final String SPEC_CHARS = "!@#$%^*-+?/,:;.";
-       private static final Pattern PASS_PATTERN=Pattern.compile("((?=.*\\d)(?=.*[a-z])(?=.*[A-Z])(?=.*[" + SPEC_CHARS +"]).{6,20})");
+       private static final Pattern PASS_PATTERN=Pattern.compile("(((?=.*[a-z,A-Z])(((?=.*\\d))|(?=.*[" + SPEC_CHARS +"]))).{6,20})");
        /**
+        *  (                           # Start of group
+        *  (?=.*[a-z,A-Z])     #   must contain one character
+        *  
+        *  (?=.*\d)            #   must contain one digit from 0-9 
+        *        OR
+        *  (?=.*[@#$%])        #   must contain one special symbols in the list SPEC_CHARS
+        *  
+        *              .               #     match anything with previous condition checking
+        *          {6,20}      #        length at least 6 characters and maximum of 20
+        *  )                           # End of group
+        *
+        * Another example, more stringent pattern
+        private static final Pattern PASS_PATTERN=Pattern.compile("((?=.*\\d)(?=.*[a-z])(?=.*[A-Z])(?=.*[" + SPEC_CHARS +"]).{6,20})");
         *  Attribution: from mkyong.com
         *  (                           # Start of group
-        *  (?=.*\d)                    #   must contains one digit from 0-9
-        *  (?=.*[a-z])         #   must contains one lowercase characters
-        *  (?=.*[A-Z])         #   must contains one uppercase characters
-        *  (?=.*[@#$%])                #   must contains one special symbols in the list SPEC_CHARS
+        *  (?=.*\d)            #   must contain one digit from 0-9
+        *  (?=.*[a-z])         #   must contain one lowercase characters
+        *  (?=.*[A-Z])         #   must contain one uppercase characters
+        *  (?=.*[@#$%])        #   must contain one special symbols in the list SPEC_CHARS
         *              .               #     match anything with previous condition checking
         *          {6,20}      #        length at least 6 characters and maximum of 20
         *  )                           # End of group
@@ -230,11 +243,11 @@ public class DefaultOrg implements Organization {
        }
 
        private static final String[] rules = new String[] {
-                       "Passwords must contain one digit from 0-9",
-                       "Passwords must contain one lowercase character",
-                       "Passwords must contain one uppercase character",
-                       "Passwords must contain one special symbols in the list \""+ SPEC_CHARS + '"',
-                       "Passwords must be between 6 and 20 chars in length"
+                       "Passwords must contain letters",
+                       "Passwords must contain one of the following:",
+                       "  Number",
+                       "  One special symbols in the list \""+ SPEC_CHARS + '"',
+                       "Passwords must be between 6 and 20 chars in length",
        };
 
        @Override
@@ -251,7 +264,7 @@ public class DefaultOrg implements Organization {
        public Response notify(AuthzTrans trans, Notify type, String url, String[] identities, String[] ccs, String summary, Boolean urgent) {
                String system = trans.getProperty("CASS_ENV", "");
 
-               ArrayList<String> toList = new ArrayList<String>();
+               ArrayList<String> toList = new ArrayList<>();
                Identity identity;
                if (identities != null) {
                        for (String user : identities) {
@@ -278,7 +291,7 @@ public class DefaultOrg implements Organization {
                        return Response.ERR_NotificationFailure;
                }
 
-               ArrayList<String> ccList = new ArrayList<String>();
+               ArrayList<String> ccList = new ArrayList<>();
 
                // If we're sending an urgent email, CC the user's supervisor
                //
@@ -393,7 +406,7 @@ public class DefaultOrg implements Organization {
 
                int status = 1;
 
-               List<String> to = new ArrayList<String>();
+               List<String> to = new ArrayList<>();
                for(String em : toList) {
                        if(em.indexOf('@')<0) {
                                to.add(new DefaultOrgIdentity(trans, em, this).email());
@@ -402,7 +415,7 @@ public class DefaultOrg implements Organization {
                        }
                }
 
-               List<String> cc = new ArrayList<String>();
+               List<String> cc = new ArrayList<>();
                if(ccList!=null) {
                        if(!ccList.isEmpty()) {
 
@@ -461,7 +474,7 @@ public class DefaultOrg implements Organization {
                                        message.addHeader("X-Priority", "1");
                                }
 
-                               ArrayList<String> newBody = new ArrayList<String>();
+                               ArrayList<String> newBody = new ArrayList<>();
 
                                Address temp[] = getAddresses(to);
                                String headerString = "TO:\t" + InternetAddress.toString(temp) + "\n";
@@ -574,7 +587,7 @@ public class DefaultOrg implements Organization {
        @Override
        public List<Identity> getApprovers(AuthzTrans trans, String user) throws OrganizationException {
                Identity orgIdentity = getIdentity(trans, user);
-               List<Identity> orgIdentitys = new ArrayList<Identity>();
+               List<Identity> orgIdentitys = new ArrayList<>();
                if(orgIdentity!=null) {
                        Identity supervisor = orgIdentity.responsibleTo();
                        if(supervisor!=null) {