Merge pull request #19 from alianza-dev/paraplexed/add_authorization_…

…username

Paraplexed/add authorization username

.gitignore

@@ -5,3 +5,4 @@ target/
 peers-demo/src/main/java/net/sourceforge/peers/demo/MyConfig.java
 \#*#
 bin/
+logs/

conf/peers.xml

@@ -44,6 +44,9 @@
  	<!-- you can specify an even rtp port to use for incoming and outgoing rtp
  	     traffic, 0 can be used to choose a random even free port -->
   <rtpPort>0</rtpPort>
+  <!-- if you need to specify an authorization username different than
+       the userPart, if empty will default to what is specified in userPart -->
+  <authorizationUsername></authorizationUsername>
   <!-- mediaMode corresponds to the way media is managed. Three values are
        possible for this parameter:
          - captureAndPlayback: capture sound from microphone, send

peers-demo/src/main/java/net/sourceforge/peers/demo/CustomConfig.java

@@ -36,6 +36,8 @@ public InetAddress getLocalInetAddress() {
     @Override
     public MediaMode getMediaMode() { return MediaMode.captureAndPlayback; }
 
+    @Override public String getAuthorizationUsername() { return getUserPart(); }
+
     @Override
     public void setPublicInetAddress(InetAddress inetAddress) {
         publicIpAddress = inetAddress;
@@ -57,5 +59,6 @@ public void setPublicInetAddress(InetAddress inetAddress) {
     @Override public void setMediaFile(String mediaFile) { }
     @Override public void setRtpPort(int rtpPort) { }
     @Override public void save() { }
+    @Override public void setAuthorizationUsername(String authorizationUsername) { }
 
 }

peers-lib/src/main/java/net/sourceforge/peers/Config.java

@@ -38,6 +38,7 @@ public interface Config {
     public boolean isMediaDebug();
     public String getMediaFile();
     public int getRtpPort();
+    public String getAuthorizationUsername();
     public void setLocalInetAddress(InetAddress inetAddress);
     public void setPublicInetAddress(InetAddress inetAddress);
     public void setUserPart(String userPart);
@@ -49,5 +50,6 @@ public interface Config {
     public void setMediaDebug(boolean mediaDebug);
     public void setMediaFile(String mediaFile);
     public void setRtpPort(int rtpPort);
+    public void setAuthorizationUsername(String authorizationUsername);
 
 }

peers-lib/src/main/java/net/sourceforge/peers/JavaConfig.java

@@ -37,6 +37,7 @@ public class JavaConfig implements Config {
     private boolean mediaDebug;
     private String mediaFile;
     private int rtpPort;
+    private String authorizationUsername;
 
     @Override
     public void save() {
@@ -93,6 +94,10 @@ public int getRtpPort() {
         return rtpPort;
     }
 
+    public String getAuthorizationUsername() {
+        return authorizationUsername;
+    }
+
     @Override
     public void setLocalInetAddress(InetAddress inetAddress) {
         localInetAddress = inetAddress;
@@ -143,6 +148,10 @@ public void setRtpPort(int rtpPort) {
         this.rtpPort = rtpPort;
     }
 
+    public void setAuthorizationUsername(String authorizationUsername) {
+        this.authorizationUsername = authorizationUsername;
+    }
+
     @Override
     public String getMediaFile() {
         return mediaFile;

peers-lib/src/main/java/net/sourceforge/peers/XmlConfig.java

@@ -68,6 +68,7 @@ public class XmlConfig implements Config {
     private boolean mediaDebug;
     private String mediaFile;
     private int rtpPort;
+    private String authorizationUsername;
 
     // corresponding DOM nodes
 
@@ -81,6 +82,7 @@ public class XmlConfig implements Config {
     private Node mediaDebugNode;
     private Node mediaFileNode;
     private Node rtpPortNode;
+    private Node authUserNode;
 
     // non-persistent variables
 
@@ -130,6 +132,10 @@ public XmlConfig(String fileName, Logger logger) {
         } else {
             userPart = userPartNode.getTextContent();
         }
+        authUserNode = getFirstChild(documentElement, "authorizationUsername");
+        if (! isNullOrEmpty(authUserNode)) {
+            authorizationUsername = authUserNode.getTextContent();
+        }
         domainNode = getFirstChild(documentElement, "domain");
         if (isNullOrEmpty(domainNode)) {
             logger.error("domain not found in configuration file");
@@ -284,6 +290,11 @@ public int getRtpPort() {
         return rtpPort;
     }
 
+    @Override
+    public String getAuthorizationUsername() {
+        return authorizationUsername;
+    }
+
     @Override
     public void setLocalInetAddress(InetAddress inetAddress) {
         this.localInetAddress = inetAddress;
@@ -348,6 +359,12 @@ public void setRtpPort(int rtpPort) {
         rtpPortNode.setTextContent(Integer.toString(rtpPort));
     }
 
+    @Override
+    public void setAuthorizationUsername(String authorizationUsername) {
+        this.authorizationUsername = authorizationUsername;
+        authUserNode.setTextContent(authorizationUsername);
+    }
+
     @Override
     public String getMediaFile() {
         return mediaFile;

peers-lib/src/main/java/net/sourceforge/peers/sip/core/useragent/ChallengeManager.java

@@ -54,6 +54,7 @@ public class ChallengeManager implements MessageInterceptor {
     private String profileUri;
     private String qop;
     private String cnonce;
+    private String authorizationUsername;
 
     private static volatile int nonceCount = 1;
     private String nonceCountHex;
@@ -84,6 +85,10 @@ public ChallengeManager(Config config,
 
     private void init() {
         username = config.getUserPart();
+        authorizationUsername = config.getAuthorizationUsername();
+        if (authorizationUsername == null || authorizationUsername.isEmpty()) {
+            authorizationUsername = username;
+        }
         password = config.getPassword();
         profileUri = RFC3261.SIP_SCHEME + RFC3261.SCHEME_SEPARATOR
             + username + RFC3261.AT + config.getDomain();
@@ -173,7 +178,7 @@ public void handleChallenge(SipRequest sipRequest,
 
     private String getRequestDigest(String method) {
         StringBuffer buf = new StringBuffer();
-        buf.append(username);
+        buf.append(authorizationUsername);
         buf.append(RFC2617.DIGEST_SEPARATOR);
         buf.append(realm);
         buf.append(RFC2617.DIGEST_SEPARATOR);
@@ -242,7 +247,7 @@ public void postProcess(SipMessage sipMessage) {
         digest = getRequestDigest(method);
         StringBuffer buf = new StringBuffer();
         buf.append(RFC2617.SCHEME_DIGEST).append(" ");
-        appendParameter(buf, RFC2617.PARAM_USERNAME, username);
+        appendParameter(buf, RFC2617.PARAM_USERNAME, authorizationUsername);
         buf.append(RFC2617.PARAM_SEPARATOR).append(" ");
         appendParameter(buf, RFC2617.PARAM_REALM, realm);
         buf.append(RFC2617.PARAM_SEPARATOR).append(" ");

peers-lib/src/test/java/net/sourceforge/peers/XmlConfigTestNG.java

@@ -44,6 +44,8 @@ public void testSave() throws SipUriSyntaxException, UnknownHostException {
         MediaMode mediaMode = MediaMode.echo;
         boolean mediaDebug = true;
         int rtpPort = 8002;
+        String authorizationUsername = "authUser";
+
         config.setLocalInetAddress(localHost);
         config.setUserPart(userPart);
         config.setDomain(domain);
@@ -53,6 +55,7 @@ public void testSave() throws SipUriSyntaxException, UnknownHostException {
         config.setMediaMode(mediaMode);
         config.setMediaDebug(mediaDebug);
         config.setRtpPort(rtpPort);
+        config.setAuthorizationUsername(authorizationUsername);
         config.save();
         config = new XmlConfig(fileName, logger);
         assert localHost.equals(config.getLocalInetAddress());
@@ -64,6 +67,7 @@ public void testSave() throws SipUriSyntaxException, UnknownHostException {
         assert mediaMode == config.getMediaMode();
         assert mediaDebug == config.isMediaDebug();
         assert rtpPort == config.getRtpPort();
+        assert authorizationUsername.equals(config.getAuthorizationUsername());
     }
 
 }

peers-lib/src/test/resources/net/sourceforge/peers/configTest.xml

@@ -44,6 +44,9 @@
  	<!-- you can specify the rtp port to use for incoming and outgoing rtp
  	     traffic, 0 can be used to choose a random free port -->
   <rtpPort>0</rtpPort>
+  <!-- if you need to specify an authorization username different than
+       the userPart, if empty will default to what is specified in userPart -->
+  <authorizationUsername></authorizationUsername>
   <!-- mediaMode corresponds to the way media is managed. Three values are
        possible for this parameter:
          - captureAndPlayback: capture sound from microphone, send
@@ -58,4 +61,4 @@
        contain raw data at input and output of microphone, encoder, rtp
        sender, rtp receiver, and speaker. -->
   <mediaDebug>false</mediaDebug>
-</peers>
+</peers>