for #373

TremoloSecurity · Jun 24, 2019 · 7b02990 · 7b02990
1 parent 18ecfea
commit 7b02990
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,29 @@
+## 1.0.17-2019062401
+
+**Tasks:**
+ - 1.0.17 Build [\#373](https://github.com/TremoloSecurity/OpenUnison/issues/373)
+ - move prometheus module into main code base [\#366](https://github.com/TremoloSecurity/OpenUnison/issues/366)
+
+**enhancements:**
+ - integrate scalejs-operators [\#375](https://github.com/TremoloSecurity/OpenUnison/issues/375)
+ - scalejs register - create searchable list control [\#358](https://github.com/TremoloSecurity/OpenUnison/issues/358)
+ - oidc idp - flag to sign userinfo response [\#374](https://github.com/TremoloSecurity/OpenUnison/issues/374)
+ - Add IBM mq factory to main source code base [\#372](https://github.com/TremoloSecurity/OpenUnison/issues/372)
+ - Az Authmech [\#371](https://github.com/TremoloSecurity/OpenUnison/issues/371)
+ - GitHub authentication [\#363](https://github.com/TremoloSecurity/OpenUnison/issues/363)
+ - Add default options to config parameter replacement [\#370](https://github.com/TremoloSecurity/OpenUnison/issues/370)
+ - create drupal 8 provisioning module [\#342](https://github.com/TremoloSecurity/OpenUnison/issues/342)
+ - openshift - move off of deprecated apis [\#361](https://github.com/TremoloSecurity/OpenUnison/issues/361)
+ - k8s impersonation support [\#360](https://github.com/TremoloSecurity/OpenUnison/issues/360)
+ - metadata url for saml2 [\#359](https://github.com/TremoloSecurity/OpenUnison/issues/359)
+ - add flags to organizations to determine in what situations they're visible [\#357](https://github.com/TremoloSecurity/OpenUnison/issues/357)
+ - Create a dynamic workflow for looking up groups in a db via a provisioning target [\#356](https://github.com/TremoloSecurity/OpenUnison/issues/356)
+ - Add launcher for MyVD [\#354](https://github.com/TremoloSecurity/OpenUnison/issues/354)
+
+**bugs:**
+ - scalejs register - min characters not checking correctly [\#353](https://github.com/TremoloSecurity/OpenUnison/issues/353)
+ - ScaleJS Password - Wrong error report for too many characters [\#351](https://github.com/TremoloSecurity/OpenUnison/issues/351)
+
 ## 1.0.16-2019031701
 
 **Tasks:**

diff --git a/...-unison-classes/src/main/java/com/tremolosecurity/openunison/OpenUnisonServletFilter.java b/...-unison-classes/src/main/java/com/tremolosecurity/openunison/OpenUnisonServletFilter.java
@@ -47,7 +47,7 @@ public class OpenUnisonServletFilter extends UnisonServletFilter {
 
 
 
-	public static final String version = "1.0.17-2019062001";
+	public static final String version = "1.0.17-2019062401";
 
 
 

diff --git a/unison/pom.xml b/unison/pom.xml
@@ -24,7 +24,7 @@
 		<xerces.version>2.12.0</xerces.version>
 		<alfresco-client.version>5.0.a</alfresco-client.version>
 		<javax.xml.rpc-api.version>1.1.2</javax.xml.rpc-api.version>
-		<google-api-client.version>1.29.2</google-api-client.version>
+		<google-api-client.version>1.30.1</google-api-client.version>
 		<google-api-services-plus.version>v1-rev20190328-1.28.0</google-api-services-plus.version>
 		<google-api-services-oauth2.version>v2-rev20190313-1.28.0</google-api-services-oauth2.version>
 		<google-api-services-admin-directory.version>directory_v1-rev110-1.25.0</google-api-services-admin-directory.version>
@@ -61,19 +61,19 @@
 		<googleauth.version>1.2.0</googleauth.version>
 		<activemq.version>5.15.9</activemq.version>
 		<commons-pool2.version>2.6.2</commons-pool2.version>
-		<aws-java-sdk.version>1.11.573</aws-java-sdk.version>
+		<aws-java-sdk.version>1.11.578</aws-java-sdk.version>
 		<amazon-sqs-java-messaging-lib.version>1.0.6</amazon-sqs-java-messaging-lib.version>
 		<stringtemplate.version>4.0.2</stringtemplate.version>
 		<hibernate.version>5.4.3.Final</hibernate.version>
 		<javaee.version>7.0</javaee.version>
-		<org.apache.poi.version>4.0.1</org.apache.poi.version>
+		<org.apache.poi.version>4.1.0</org.apache.poi.version>
 		<jose4j.version>0.6.5</jose4j.version>
 		<mongodb-driver.version>3.10.2</mongodb-driver.version>
 		<xalan.version>2.7.2</xalan.version>
 		<jackson.version>2.9.9</jackson.version>
 		<slf4j.version>1.7.26</slf4j.version>
 		<guava.version>28.0-jre</guava.version>
-		<undertow.version>2.0.21.Final</undertow.version>
+		<undertow.version>2.0.22.Final</undertow.version>
 	  	<jastow.version>2.1.0.Final</jastow.version>
 	  	<jboss-jstl-api_1.2_spec.version>1.1.4.Final</jboss-jstl-api_1.2_spec.version>
 	  	<xmlsec.version>2.0.5</xmlsec.version>
@@ -85,14 +85,9 @@
 	<repositories>
 		<repository>
 			<id>tremolosecurity-dependencies</id>
-			<url>https://nexus.tremolo.io/repository/dependencies/</url>
+			<url>https://nexus.tremolo.io/repository/releases/</url>
 		</repository>
-		<repository>
-			<id>nexus.tremolo.io</id>
-			<name>tremolo.io-releases</name>
-			<url>https://nexus.tremolo.io/repository/betas/</url>
-		</repository>
-
+
 		<!-- <repository>
 			<id>jboss</id>
 			<url>https://repository.jboss.org/nexus/content/repositories/</url>
@@ -109,7 +104,7 @@
 		<repository>
 			<id>nexus.tremolo.io</id>
 			<name>tremolo.io-releases</name>
-			<url>https://nexus.tremolo.io/repository/betas/</url>
+			<url>https://nexus.tremolo.io/repository/releases/</url>
 		</repository>
 
 	</distributionManagement>

diff --git a/...unison-applications-k8s/src/main/java/com/tremolosecurity/scalejs/KubectlTokenLoader.java b/...unison-applications-k8s/src/main/java/com/tremolosecurity/scalejs/KubectlTokenLoader.java
@@ -42,6 +42,7 @@ public class KubectlTokenLoader implements TokenLoader {
     String k8sCaCertName;
     String unisonCaCertName;
     private String kubectlUsage;
+    private String kubectlWinUsage;
 
     @Override
     public void init(HttpFilterConfig config, ScaleTokenConfig scaleTokenConfig) throws Exception {
@@ -52,6 +53,12 @@ public void init(HttpFilterConfig config, ScaleTokenConfig scaleTokenConfig) thr
         this.kubectlUsage = config.getAttribute("kubectlUsage").getValues().get(0);
         this.k8sCaCertName = config.getAttribute("k8sCaCertName").getValues().get(0);
         this.unisonCaCertName = config.getAttribute("unisonCaCertName").getValues().get(0);
+
+        if (config.getAttribute("kubectlWinUsage") != null) {
+        	this.kubectlWinUsage = config.getAttribute("kubectlWinUsage").getValues().get(0);
+        } else {
+        	this.kubectlWinUsage = null;
+        }
 
 
     }
@@ -121,8 +128,15 @@ public Object loadToken(AuthInfo user, HttpSession session) throws Exception {
 
 
             tokens.put("kubectl Command",this.renderTemplate(this.kubectlTemplate,templateObjects));
+
+            if (this.kubectlWinUsage != null) {
+            	tokens.put("kubectl Windows Command",this.renderTemplate(this.kubectlWinUsage,templateObjects));
+            }
+
             tokens.put("Usage",this.kubectlUsage);
 
+            tokens.put("id_token", token.getEncodedIdJSON());
+            tokens.put("refresh_token", token.getRefreshToken());
 
 
             return tokens;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -47,7 +47,7 @@ public class OpenUnisonServletFilter extends UnisonServletFilter {



		public static final String version = "1.0.17-2019062001";
		public static final String version = "1.0.17-2019062401";



Expand Down