Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

https://issues.apache.org/activemq/browse/AMQ-912 

Removed extra  activemq-core/src/main/java/org/apache/activemq/security/JassCredentialCallback.java
and renamed JassCredentialCallback.java to JassCredentialCallbackHandler.java since a Callback is very different from a CallbackHandler


git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@447635 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Hiram R. Chirino 2006-09-18 23:27:21 +00:00
parent 1a88ac6ac3
commit 648826b6d2
3 changed files with 4 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
activemq-core/src/main/java/org/apache/activemq/security/JaasAuthenticationBroker.java
View File

@ -28,7 +28,7 @@ import org.apache.activemq.broker.BrokerFilter;
import org.apache.activemq.broker.ConnectionContext;
import org.apache.activemq.command.ConnectionInfo;
import org.apache.activemq.jaas.JassCredentialCallback;
import org.apache.activemq.jaas.JassCredentialCallbackHandler;
import edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArrayList;
@ -72,7 +72,7 @@ public class JaasAuthenticationBroker extends BrokerFilter {
try {
// Do the login.
try {
JassCredentialCallback callback = new JassCredentialCallback(info.getUserName(), info.getPassword());
JassCredentialCallbackHandler callback = new JassCredentialCallbackHandler(info.getUserName(), info.getPassword());
LoginContext lc = new LoginContext(jassConfiguration, callback);
lc.login();
Subject subject = lc.getSubject();

63
activemq-core/src/main/java/org/apache/activemq/security/JassCredentialCallback.java
View File

@ -1,63 +0,0 @@
/**
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.activemq.security;
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.callback.NameCallback;
import javax.security.auth.callback.PasswordCallback;
import javax.security.auth.callback.UnsupportedCallbackException;
import java.io.IOException;
/**
* A JASS username password CallbackHandler.
*/
public class JassCredentialCallback implements CallbackHandler {
private final String username;
private final String password;
public JassCredentialCallback(String username, String password) {
this.username = username;
this.password = password;
}
public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
for (int i = 0; i < callbacks.length; i++) {
Callback callback = callbacks[i];
if (callback instanceof PasswordCallback) {
PasswordCallback passwordCallback = (PasswordCallback) callback;
if (password == null) {
passwordCallback.setPassword(null);
}
else {
passwordCallback.setPassword(password.toCharArray());
}
} else if (callback instanceof NameCallback) {
NameCallback nameCallback = (NameCallback) callback;
if (username == null) {
nameCallback.setName(null);
}
else {
nameCallback.setName(username);
}
}
}
}
}

4
activemq-jaas/src/main/java/org/apache/activemq/jaas/JassCredentialCallback.java → activemq-jaas/src/main/java/org/apache/activemq/jaas/JassCredentialCallbackHandler.java
View File

@ -28,12 +28,12 @@ import java.io.IOException;
/**
* A JASS username password CallbackHandler.
*/
public class JassCredentialCallback implements CallbackHandler {
public class JassCredentialCallbackHandler implements CallbackHandler {
private final String username;
private final String password;
public JassCredentialCallback(String username, String password) {
public JassCredentialCallbackHandler(String username, String password) {
this.username = username;
this.password = password;
}