From b29ef5c62a531bd4405a96d67502429be96adfe7 Mon Sep 17 00:00:00 2001
From: Lee Hilton <lee.hilton@leezilla.net>
Date: Thu, 18 Jun 2020 11:56:13 -0700
Subject: [PATCH] Fixed some broken namespacing

---
 create_hmac_url.php                                           | 2 +-
 extension/pom.xml                                             | 2 +-
 .../guacamole/auth/hmac/DefaultTimeProvider.java              | 2 +-
 .../guacamole/auth/hmac/HmacAuthenticatedUser.java            | 2 +-
 .../guacamole/auth/hmac/HmacAuthenticationProvider.java       | 4 ++--
 .../guacamole/auth/hmac/HmacConfigurationHandler.java         | 2 +-
 .../guacamole/auth/hmac/SignatureVerifier.java                | 2 +-
 .../guacamole/auth/hmac/TimeProviderInterface.java            | 2 +-
 .../guacamole/auth/hmac/SignatureVerifierTest.java            | 4 ++--
 up.sh                                                         | 4 ++--
 10 files changed, 13 insertions(+), 13 deletions(-)
 rename extension/src/test/java/com/generalsystemsvehicle/{ => uninvited_guest}/guacamole/auth/hmac/SignatureVerifierTest.java (80%)

diff --git a/create_hmac_url.php b/create_hmac_url.php
index 3af02c1..02c713b 100644
--- 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
index c5ea0e3..7dba3a6 100644
--- 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/extension/src/main/java/com/generalsystemsvehicle/uninvited_guest/guacamole/auth/hmac/DefaultTimeProvider.java b/extension/src/main/java/com/generalsystemsvehicle/uninvited_guest/guacamole/auth/hmac/DefaultTimeProvider.java
index 9667885..a957b11 100644
--- a/extension/src/main/java/com/generalsystemsvehicle/uninvited_guest/guacamole/auth/hmac/DefaultTimeProvider.java
+++ b/extension/src/main/java/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/extension/src/main/java/com/generalsystemsvehicle/uninvited_guest/guacamole/auth/hmac/HmacAuthenticatedUser.java b/extension/src/main/java/com/generalsystemsvehicle/uninvited_guest/guacamole/auth/hmac/HmacAuthenticatedUser.java
index 0593e7e..9be9bd3 100644
--- a/extension/src/main/java/com/generalsystemsvehicle/uninvited_guest/guacamole/auth/hmac/HmacAuthenticatedUser.java
+++ b/extension/src/main/java/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/extension/src/main/java/com/generalsystemsvehicle/uninvited_guest/guacamole/auth/hmac/HmacAuthenticationProvider.java b/extension/src/main/java/com/generalsystemsvehicle/uninvited_guest/guacamole/auth/hmac/HmacAuthenticationProvider.java
index 972c63c..00e5ef7 100644
--- a/extension/src/main/java/com/generalsystemsvehicle/uninvited_guest/guacamole/auth/hmac/HmacAuthenticationProvider.java
+++ b/extension/src/main/java/com/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/extension/src/main/java/com/generalsystemsvehicle/uninvited_guest/guacamole/auth/hmac/HmacConfigurationHandler.java b/extension/src/main/java/com/generalsystemsvehicle/uninvited_guest/guacamole/auth/hmac/HmacConfigurationHandler.java
index 5cb7d81..474af90 100644
--- a/extension/src/main/java/com/generalsystemsvehicle/uninvited_guest/guacamole/auth/hmac/HmacConfigurationHandler.java
+++ b/extension/src/main/java/com/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/extension/src/main/java/com/generalsystemsvehicle/uninvited_guest/guacamole/auth/hmac/SignatureVerifier.java b/extension/src/main/java/com/generalsystemsvehicle/uninvited_guest/guacamole/auth/hmac/SignatureVerifier.java
index cf70249..d3d23bd 100644
--- a/extension/src/main/java/com/generalsystemsvehicle/uninvited_guest/guacamole/auth/hmac/SignatureVerifier.java
+++ b/extension/src/main/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/extension/src/main/java/com/generalsystemsvehicle/uninvited_guest/guacamole/auth/hmac/TimeProviderInterface.java b/extension/src/main/java/com/generalsystemsvehicle/uninvited_guest/guacamole/auth/hmac/TimeProviderInterface.java
index de8a8c0..e1d7f4a 100644
--- a/extension/src/main/java/com/generalsystemsvehicle/uninvited_guest/guacamole/auth/hmac/TimeProviderInterface.java
+++ b/extension/src/main/java/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/extension/src/test/java/com/generalsystemsvehicle/guacamole/auth/hmac/SignatureVerifierTest.java b/extension/src/test/java/com/generalsystemsvehicle/uninvited_guest/guacamole/auth/hmac/SignatureVerifierTest.java
similarity index 80%
rename from extension/src/test/java/com/generalsystemsvehicle/guacamole/auth/hmac/SignatureVerifierTest.java
rename to extension/src/test/java/com/generalsystemsvehicle/uninvited_guest/guacamole/auth/hmac/SignatureVerifierTest.java
index 4bc8465..0b9b351 100644
--- a/extension/src/test/java/com/generalsystemsvehicle/guacamole/auth/hmac/SignatureVerifierTest.java
+++ b/extension/src/test/java/com/generalsystemsvehicle/uninvited_guest/guacamole/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
index f64bc2d..c0c2672 100755
--- 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