b/295761910 Expose version number in footer (#136)

Show version number in page footer.
GoogleCloudPlatform · Aug 13, 2023 · 359a6f8 · 359a6f8
1 parent b27948e
commit 359a6f8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/sources/src/main/java/com/google/solutions/jitaccess/web/ApiResource.java b/sources/src/main/java/com/google/solutions/jitaccess/web/ApiResource.java
@@ -24,6 +24,7 @@
 import com.google.common.base.Preconditions;
 import com.google.solutions.jitaccess.core.AccessDeniedException;
 import com.google.solutions.jitaccess.core.AccessException;
+import com.google.solutions.jitaccess.core.ApplicationVersion;
 import com.google.solutions.jitaccess.core.Exceptions;
 import com.google.solutions.jitaccess.core.adapters.LogAdapter;
 import com.google.solutions.jitaccess.core.data.*;
@@ -138,6 +139,7 @@ public PolicyResponse getPolicy(
     return new PolicyResponse(
       options.justificationHint,
       iapPrincipal.getId(),
+      ApplicationVersion.VERSION_STRING,
       (int)options.maxActivationTimeout.toMinutes(),
       Math.min(60, (int)options.maxActivationTimeout.toMinutes()));
   }
@@ -679,12 +681,14 @@ private static LogAdapter.LogEntry addLabels(
   public static class PolicyResponse {
     public final String justificationHint;
     public final UserId signedInUser;
+    public String applicationVersion;
     public final int defaultActivationTimeout; // in minutes.
     public final int maxActivationTimeout;     // in minutes.
 
     private PolicyResponse(
       String justificationHint,
       UserId signedInUser,
+      String applicationVersion,
       int maxActivationTimeoutInMinutes,
       int defaultActivationTimeoutInMinutes
     ) {
@@ -696,6 +700,7 @@ private PolicyResponse(
 
       this.justificationHint = justificationHint;
       this.signedInUser = signedInUser;
+      this.applicationVersion = applicationVersion;
       this.defaultActivationTimeout = defaultActivationTimeoutInMinutes;
       this.maxActivationTimeout = maxActivationTimeoutInMinutes;
     }

diff --git a/sources/src/main/resources/META-INF/resources/index.html b/sources/src/main/resources/META-INF/resources/index.html
@@ -371,7 +371,7 @@ <h2 class="mdl-card__title-text">Audit and review just-in-time access</h2>
         <footer class="mdl-mini-footer">
             <div>Signed in as&nbsp;<span id="signed-in-user"></span>&nbsp;(<a href="?gcp-iap-mode=CLEAR_LOGIN_COOKIE">change</a>)</div>
             &nbsp;|&nbsp;
-            <div>Powered by&nbsp;<a href="https://github.com/GoogleCloudPlatform/jit-access">JIT Access</a></div>
+            <div>Powered by&nbsp;<a href="https://github.com/GoogleCloudPlatform/jit-access">JIT Access <span id="application-version"></span></a></div>
         </footer>
         <div id="toast" class="mdl-snackbar mdl-js-snackbar">
             <div class="mdl-snackbar__text">Toast!</div>
@@ -934,6 +934,7 @@ <h2 class="mdl-card__title-text">Audit and review just-in-time access</h2>
                 }
 
                 $("#signed-in-user").text(backend.policy.signedInUser.email)
+                $("#application-version").text(backend.policy.applicationVersion)
             }
             catch (error) {
                 gui.showToast(error, true);

diff --git a/sources/src/main/resources/META-INF/resources/model.js b/sources/src/main/resources/META-INF/resources/model.js
@@ -337,7 +337,8 @@ class DebugModel extends Model {
                 email: "[email protected]"
             },
             defaultActivationTimeout: 60,
-            maxActivationTimeout: 120
+            maxActivationTimeout: 120,
+            applicationVersion: 'debug'
         };
     }