Fixed some broken namespacing

generalsystemsvehicle · Jun 18, 2020 · b29ef5c · b29ef5c
1 parent 4bf7640
commit b29ef5c
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 13 deletions.
diff --git a/create_hmac_url.php b/create_hmac_url.php
@@ -20,7 +20,7 @@
 
 $urlPrefix = 'https://localhost:8443';
 
-$client = $connection . "\0" . 'c' . "\0" . 'hmac-auth-config';
+$client = $connection . "\0" . 'c' . "\0" . 'hmac';
 
 $url = $urlPrefix . '/#/client/' . base64_encode($client) . '?' .
 	'&timestamp=' . $timestamp .

diff --git a/extension/pom.xml b/extension/pom.xml
@@ -7,7 +7,7 @@
     <groupId>org.apache.guacamole</groupId>
     <artifactId>uninvited_guest-guacamole-auth-hmac</artifactId>
     <packaging>jar</packaging>
-    <version>1.0.0</version>
+    <version>1.0.1</version>
     <name>uninvited_guest-guacamole-auth-hmac</name>
     <url>https://github.com/generalsystemsvehicle/uninvited_guest</url>
 

diff --git a/...va/com/generalsystemsvehicle/uninvited_guest/guacamole/auth/hmac/DefaultTimeProvider.java b/...va/com/generalsystemsvehicle/uninvited_guest/guacamole/auth/hmac/DefaultTimeProvider.java
@@ -1,4 +1,4 @@
-package com.generalsystemsvehicle.guacamole.auth.hmac;
+package com.generalsystemsvehicle.uninvited_guest.guacamole.auth.hmac;
 
 public class DefaultTimeProvider implements TimeProviderInterface {
     public long currentTimeMillis() {

diff --git a/.../com/generalsystemsvehicle/uninvited_guest/guacamole/auth/hmac/HmacAuthenticatedUser.java b/.../com/generalsystemsvehicle/uninvited_guest/guacamole/auth/hmac/HmacAuthenticatedUser.java
@@ -1,4 +1,4 @@
-package com.generalsystemsvehicle.guacamole.auth.hmac;
+package com.generalsystemsvehicle.uninvited_guest.guacamole.auth.hmac;
 
 import java.util.Map;
 import java.util.UUID;

diff --git a/...generalsystemsvehicle/uninvited_guest/guacamole/auth/hmac/HmacAuthenticationProvider.java b/...generalsystemsvehicle/uninvited_guest/guacamole/auth/hmac/HmacAuthenticationProvider.java
@@ -1,4 +1,4 @@
-package com.generalsystemsvehicle.guacamole.auth.hmac;
+package com.generalsystemsvehicle.uninvited_guest.guacamole.auth.hmac;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.*;
@@ -202,7 +202,7 @@ private Map<String, GuacamoleConfiguration> getAuthorizedConfigurationsForUser(A
 
     @Override
     public String getIdentifier() {
-        return "hmac-auth-config";
+        return "hmac";
     }
 
     @Override

diff --git a/...m/generalsystemsvehicle/uninvited_guest/guacamole/auth/hmac/HmacConfigurationHandler.java b/...m/generalsystemsvehicle/uninvited_guest/guacamole/auth/hmac/HmacConfigurationHandler.java
@@ -1,4 +1,4 @@
-package com.generalsystemsvehicle.guacamole.auth.hmac;
+package com.generalsystemsvehicle.uninvited_guest.guacamole.auth.hmac;
 
 import java.util.HashMap;
 import java.util.Map;

diff --git a/...java/com/generalsystemsvehicle/uninvited_guest/guacamole/auth/hmac/SignatureVerifier.java b/...java/com/generalsystemsvehicle/uninvited_guest/guacamole/auth/hmac/SignatureVerifier.java
@@ -1,4 +1,4 @@
-package com.generalsystemsvehicle.guacamole.auth.hmac;
+package com.generalsystemsvehicle.uninvited_guest.guacamole.auth.hmac;
 
 import com.sun.org.apache.xml.internal.security.utils.Base64;
 import org.slf4j.Logger;

diff --git a/.../com/generalsystemsvehicle/uninvited_guest/guacamole/auth/hmac/TimeProviderInterface.java b/.../com/generalsystemsvehicle/uninvited_guest/guacamole/auth/hmac/TimeProviderInterface.java
@@ -1,4 +1,4 @@
-package com.generalsystemsvehicle.guacamole.auth.hmac;
+package com.generalsystemsvehicle.uninvited_guest.guacamole.auth.hmac;
 
 public interface TimeProviderInterface {
     public long currentTimeMillis();

diff --git a/...mole/auth/hmac/SignatureVerifierTest.java → ...mole/auth/hmac/SignatureVerifierTest.java b/...mole/auth/hmac/SignatureVerifierTest.java → ...mole/auth/hmac/SignatureVerifierTest.java
@@ -1,7 +1,7 @@
-package com.generalsystemsvehicle.guacamole.auth.hmac;
+package com.generalsystemsvehicle.uninvited_guest.guacamole.auth.hmac;
 
 import junit.framework.TestCase;
-import com.generalsystemsvehicle.guacamole.auth.hmac.SignatureVerifier;
+import com.generalsystemsvehicle.uninvited_guest.guacamole.auth.hmac.SignatureVerifier;
 
 public class SignatureVerifierTest extends TestCase {
     private SignatureVerifier verifier;

diff --git a/up.sh b/up.sh
@@ -2,14 +2,14 @@
 
 clear
 
-rm -fr ./docker-environment/GUACAMOLE_HOME/extensions/uninvited_guest-guacamole-auth-hmac-1.0.0.jar
+rm -fr ./docker-environment/GUACAMOLE_HOME/extensions/uninvited_guest-guacamole-auth-hmac-1.0.1.jar
 cd extension
 if ! mvn package ; then
     cd ..
     exit;
 fi
 cd ..
-cp ./extension/target/uninvited_guest-guacamole-auth-hmac-1.0.0.jar ./docker-environment/GUACAMOLE_HOME/extensions/
+cp ./extension/target/uninvited_guest-guacamole-auth-hmac-1.0.1.jar ./docker-environment/GUACAMOLE_HOME/extensions/
 
 clear