Make TOTP period optional

hashicorp · Jul 5, 2024 · 807679c · 807679c
1 parent 8663321
commit 807679c
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 19 deletions.
diff --git a/ui/app/components/generate-credentials-totp.js b/ui/app/components/generate-credentials-totp.js
@@ -11,13 +11,18 @@ import timestamp from 'core/utils/timestamp';
 import { getUnixTime } from 'date-fns';
 
 export default class GenerateCredentialsTotp extends Component {
-  title = "Generate TOTP code";
+  title = 'Generate TOTP code';
 
   @tracked elapsedTime = 0;
   nextTick = null;
 
   get remainingTime() {
     const { model } = this.args;
+
+    if (!model.period) {
+      return;
+    }
+
     return model.period - this.elapsedTime;
   }
 
@@ -28,14 +33,17 @@ export default class GenerateCredentialsTotp extends Component {
 
   @action
   startTimer() {
-    this.nextTick = later(
-      this,
-      function () {
-        const { model } = this.args;
-        this.elapsedTime = getUnixTime(timestamp.now()) % model.period;
-        this.startTimer();
-      },
-      1000
-    );
+    const { model } = this.args;
+
+    if (model.period) {
+      this.nextTick = later(
+        this,
+        function () {
+          this.elapsedTime = getUnixTime(timestamp.now()) % model.period;
+          this.startTimer();
+        },
+        1000
+      );
+    }
   }
 }
diff --git a/ui/app/routes/vault/cluster/secrets/backend/credentials.js b/ui/app/routes/vault/cluster/secrets/backend/credentials.js
@@ -71,6 +71,16 @@ export default Route.extend({
     return this.store.adapterFor('totp').generateCode(backend, keyName);
   },
 
+  async getTOTPKey(backend, keyName) {
+    try {
+      const key = await this.store.queryRecord('totp', { id: keyName, backend });
+      return key;
+    } catch (e) {
+      // swallow error, non-essential data
+      return;
+    }
+  },
+
   async model(params) {
     const role = params.secret;
     const { id: backendPath, type: backendType } = this.modelFor('vault.cluster.secrets.backend');
@@ -82,8 +92,7 @@ export default Route.extend({
       awsRole = await this.getAwsRole(backendPath, role);
     } else if (backendType === 'totp') {
       totpCode = await this.getTOTPCode(backendPath, role);
-      const totpKey = await this.store.queryRecord('totp', { id: role, backend: backendPath });
-      totpCode.period = totpKey.period;
+      totpCode.period = (await this.getTOTPKey(backendPath, role))?.period;
     }
 
     return resolve({
@@ -98,7 +107,7 @@ export default Route.extend({
   },
 
   async afterModel(model, transition) {
-    if (model.backendType === 'totp') {
+    if (model.backendType === 'totp' && model.totpCode.period) {
       later(
         () => {
           this.refresh();

diff --git a/ui/app/templates/components/generate-credentials-totp.hbs b/ui/app/templates/components/generate-credentials-totp.hbs
@@ -32,10 +32,12 @@
   <MessageError @model={{this.model}} />
   <InfoTableRow @label="Code">
     <MaskedInput @name="code" @value={{@model.code}} @displayOnly={{true}} @allowCopy={{true}} />
-    <label class="code-validity">
-      <div>Valid for {{this.remainingTime}} seconds</div>
-      <progress id="code-validity" value="{{this.elapsedTime}}" max="{{@model.period}}"></progress>
-    </label>
+    {{#if @model.period}}
+      <label class="code-validity">
+        <div>Valid for {{this.remainingTime}} seconds</div>
+        <progress id="code-validity" value="{{this.elapsedTime}}" max="{{@model.period}}"></progress>
+      </label>
+    {{/if}}
   </InfoTableRow>
 </div>
 <div class="field is-grouped box is-fullwidth is-bottomless">
@@ -48,4 +50,4 @@
       data-test-secret-generate-back
     />
   </div>
-</div>
+</div>
diff --git a/ui/app/templates/components/totp-edit.hbs b/ui/app/templates/components/totp-edit.hbs
@@ -133,4 +133,4 @@
       />
     {{/each}}
   </div>
-{{/if}}
+{{/if}}
-Original file line number
+Diff line change
@@ Expand Up / @@ -133,4 +133,4 @@ @@
           />
         {{/each}}
       </div>
-    {{/if}}
+    {{/if}}