src/share/classes/javax/security/auth/login/LoginContext.java

rev 1461 : 6987827: security/util/Resources.java needs improvement
Reviewed-by: valeriep

*** 256,266 ****
                                  ("createLoginContext." + name));
          }
  
          if (name == null)
              throw new LoginException
!                 (ResourcesMgr.getString("Invalid null input: name"));
  
          // get the Configuration
          if (config == null) {
              config = java.security.AccessController.doPrivileged
                  (new java.security.PrivilegedAction<Configuration>() {
--- 256,266 ----
                                  ("createLoginContext." + name));
          }
  
          if (name == null)
              throw new LoginException
!                 (ResourcesMgr.getString("Invalid.null.input.name"));
  
          // get the Configuration
          if (config == null) {
              config = java.security.AccessController.doPrivileged
                  (new java.security.PrivilegedAction<Configuration>() {
*** 280,290 ****
              }
  
              entries = config.getAppConfigurationEntry(OTHER);
              if (entries == null) {
                  MessageFormat form = new MessageFormat(ResourcesMgr.getString
!                         ("No LoginModules configured for name"));
                  Object[] source = {name};
                  throw new LoginException(form.format(source));
              }
          }
          moduleStack = new ModuleInfo[entries.length];
--- 280,290 ----
              }
  
              entries = config.getAppConfigurationEntry(OTHER);
              if (entries == null) {
                  MessageFormat form = new MessageFormat(ResourcesMgr.getString
!                         ("No.LoginModules.configured.for.name"));
                  Object[] source = {name};
                  throw new LoginException(form.format(source));
              }
          }
          moduleStack = new ModuleInfo[entries.length];
*** 394,404 ****
      public LoginContext(String name, Subject subject)
      throws LoginException {
          init(name);
          if (subject == null)
              throw new LoginException
!                 (ResourcesMgr.getString("invalid null Subject provided"));
          this.subject = subject;
          subjectProvided = true;
          loadDefaultCallbackHandler();
      }
  
--- 394,404 ----
      public LoginContext(String name, Subject subject)
      throws LoginException {
          init(name);
          if (subject == null)
              throw new LoginException
!                 (ResourcesMgr.getString("invalid.null.Subject.provided"));
          this.subject = subject;
          subjectProvided = true;
          loadDefaultCallbackHandler();
      }
  
*** 430,440 ****
      public LoginContext(String name, CallbackHandler callbackHandler)
      throws LoginException {
          init(name);
          if (callbackHandler == null)
              throw new LoginException(ResourcesMgr.getString
!                                 ("invalid null CallbackHandler provided"));
          this.callbackHandler = new SecureCallbackHandler
                                  (java.security.AccessController.getContext(),
                                  callbackHandler);
      }
  
--- 430,440 ----
      public LoginContext(String name, CallbackHandler callbackHandler)
      throws LoginException {
          init(name);
          if (callbackHandler == null)
              throw new LoginException(ResourcesMgr.getString
!                                 ("invalid.null.CallbackHandler.provided"));
          this.callbackHandler = new SecureCallbackHandler
                                  (java.security.AccessController.getContext(),
                                  callbackHandler);
      }
  
*** 471,481 ****
      public LoginContext(String name, Subject subject,
                          CallbackHandler callbackHandler) throws LoginException {
          this(name, subject);
          if (callbackHandler == null)
              throw new LoginException(ResourcesMgr.getString
!                                 ("invalid null CallbackHandler provided"));
          this.callbackHandler = new SecureCallbackHandler
                                  (java.security.AccessController.getContext(),
                                  callbackHandler);
      }
  
--- 471,481 ----
      public LoginContext(String name, Subject subject,
                          CallbackHandler callbackHandler) throws LoginException {
          this(name, subject);
          if (callbackHandler == null)
              throw new LoginException(ResourcesMgr.getString
!                                 ("invalid.null.CallbackHandler.provided"));
          this.callbackHandler = new SecureCallbackHandler
                                  (java.security.AccessController.getContext(),
                                  callbackHandler);
      }
  
*** 634,644 ****
       * @exception LoginException if the logout fails.
       */
      public void logout() throws LoginException {
          if (subject == null) {
              throw new LoginException(ResourcesMgr.getString
!                 ("null subject - logout called before login"));
          }
  
          // module invoked in doPrivileged
          invokePriv(LOGOUT_METHOD);
      }
--- 634,644 ----
       * @exception LoginException if the logout fails.
       */
      public void logout() throws LoginException {
          if (subject == null) {
              throw new LoginException(ResourcesMgr.getString
!                 ("null.subject.logout.called.before.login"));
          }
  
          // module invoked in doPrivileged
          invokePriv(LOGOUT_METHOD);
      }
*** 800,824 ****
                          debug.println(methodName + " ignored");
                  }
  
              } catch (NoSuchMethodException nsme) {
                  MessageFormat form = new MessageFormat(ResourcesMgr.getString
!                         ("unable to instantiate LoginModule, module, because " +
!                         "it does not provide a no-argument constructor"));
                  Object[] source = {moduleStack[i].entry.getLoginModuleName()};
                  throwException(null, new LoginException(form.format(source)));
              } catch (InstantiationException ie) {
                  throwException(null, new LoginException(ResourcesMgr.getString
!                         ("unable to instantiate LoginModule: ") +
                          ie.getMessage()));
              } catch (ClassNotFoundException cnfe) {
                  throwException(null, new LoginException(ResourcesMgr.getString
!                         ("unable to find LoginModule class: ") +
                          cnfe.getMessage()));
              } catch (IllegalAccessException iae) {
                  throwException(null, new LoginException(ResourcesMgr.getString
!                         ("unable to access LoginModule: ") +
                          iae.getMessage()));
              } catch (InvocationTargetException ite) {
  
                  // failure cases
  
--- 800,823 ----
                          debug.println(methodName + " ignored");
                  }
  
              } catch (NoSuchMethodException nsme) {
                  MessageFormat form = new MessageFormat(ResourcesMgr.getString
!                         ("unable.to.instantiate.LoginModule.module.because.it.does.not.provide.a.no.argument.constructor"));
                  Object[] source = {moduleStack[i].entry.getLoginModuleName()};
                  throwException(null, new LoginException(form.format(source)));
              } catch (InstantiationException ie) {
                  throwException(null, new LoginException(ResourcesMgr.getString
!                         ("unable.to.instantiate.LoginModule.") +
                          ie.getMessage()));
              } catch (ClassNotFoundException cnfe) {
                  throwException(null, new LoginException(ResourcesMgr.getString
!                         ("unable.to.find.LoginModule.class.") +
                          cnfe.getMessage()));
              } catch (IllegalAccessException iae) {
                  throwException(null, new LoginException(ResourcesMgr.getString
!                         ("unable.to.access.LoginModule.") +
                          iae.getMessage()));
              } catch (InvocationTargetException ite) {
  
                  // failure cases
  
*** 923,933 ****
              // no module succeeded -- return the first error
              throwException(firstError, null);
          } else if (success == false) {
              // no module succeeded -- all modules were IGNORED
              throwException(new LoginException
!                 (ResourcesMgr.getString("Login Failure: all modules ignored")),
                  null);
          } else {
              // success
  
              clearState();
--- 922,932 ----
              // no module succeeded -- return the first error
              throwException(firstError, null);
          } else if (success == false) {
              // no module succeeded -- all modules were IGNORED
              throwException(new LoginException
!                 (ResourcesMgr.getString("Login.Failure.all.modules.ignored")),
                  null);
          } else {
              // success
  
              clearState();