GUACAMOLE-770: Switch to Boolean field for clearing data.

extensions/guacamole-auth-totp/src/main/java/org/apache/guacamole/auth/totp/user/TOTPUser.java

@@ -43,13 +43,18 @@ public class TOTPUser extends DelegatingUser {
      * confirmed by the user, and the user is thus fully enrolled.
      */
     public static final String TOTP_KEY_CONFIRMED_ATTRIBUTE_NAME = "guac-totp-key-confirmed";
+    
+    /**
+     * The name of the field used to trigger a reset of the TOTP data.
+     */
+    public static final String TOTP_KEY_SECRET_RESET_FIELD = "guac-totp-reset";
 
     /**
      * The form which contains all configurable properties for this user.
      */
     public static final Form TOTP_CONFIG_FORM = new Form("totp-config-form",
             Arrays.asList(
-                    new BooleanField(TOTP_KEY_SECRET_ATTRIBUTE_NAME, ""),
+                    new BooleanField(TOTP_KEY_SECRET_RESET_FIELD, "true"),
                     new BooleanField(TOTP_KEY_CONFIRMED_ATTRIBUTE_NAME, "true")
             )
     );
@@ -81,6 +86,17 @@ public class TOTPUser extends DelegatingUser {
 
         // Create independent, mutable copy of attributes
         Map<String, String> attributes = new HashMap<>(super.getAttributes());
+        
+        // Protect the secret value by removing it
+        String secret = attributes.remove(TOTP_KEY_SECRET_ATTRIBUTE_NAME);
+        
+        // If secret is null or empty, mark the reset as true.
+        if (secret == null || secret.isEmpty())
+            attributes.put(TOTP_KEY_SECRET_RESET_FIELD, "true");
+            
+        // If secret has a value, mark the reset as false.
+        else
+            attributes.put(TOTP_KEY_SECRET_RESET_FIELD, "false");
 
         return attributes;
 
@@ -91,6 +107,13 @@ public class TOTPUser extends DelegatingUser {
 
         // Create independent, mutable copy of attributes
         attributes = new HashMap<>(attributes);
+        
+        // Pull off the boolean reset field
+        String reset = attributes.remove(TOTP_KEY_SECRET_RESET_FIELD);
+        
+        // If reset has been set to true, clear the secret.
+        if (reset != null && reset.equals("true"))
+            attributes.put(TOTP_KEY_SECRET_ATTRIBUTE_NAME, null);
 
         super.setAttributes(attributes);
 

extensions/guacamole-auth-totp/src/main/resources/config/totpConfig.js

@@ -29,12 +29,5 @@ angular.module('guacTOTP').config(['formServiceProvider',
         controller  : 'authenticationCodeFieldController',
         templateUrl : 'app/ext/totp/templates/authenticationCodeField.html'
     });
-    
-    // Add field type for resetting TOTP data
-    formServiceProvider.registerFieldType('GUAC_TOTP_RESET', {
-        module      : 'guacTOTP',
-        controller  : 'totpResetFieldController',
-        templateUrl : 'app/form/templates/checkboxField.html'
-    });
 
 }]);

extensions/guacamole-auth-totp/src/main/resources/controllers/totpResetFieldController.js

@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * Controller for the "GUAC_TOTP_CODE" field which prompts the user to enter
- * the code generated by their authentication device.
- */
-angular.module('guacTOTP').controller('totpResetFieldController', ['$scope', '$window',
-        function totpResetFieldController($scope, $window) {
-
-    var origValue = $scope.model;
-            
-    // Update typed value when model is changed
-    $scope.$watch('model', function modelChanged(model) {
-        if (!model || model === '')
-            $scope.typedValue = true;
-        else
-            $scope.typedValue = false;
-    });
-
-    // Update string value in model when typed value is changed
-    $scope.$watch('typedValue', function typedValueChanged(typedValue) {
-        if (typedValue && typedValue !== '')
-            $scope.model = '';
-        
-        else
-            $scope.model = origValue;
-    });
-        
-}]);

extensions/guacamole-auth-totp/src/main/resources/translations/en.json

@@ -33,7 +33,7 @@
     
     "USER_ATTRIBUTES" : {
         
-        "FIELD_HEADER_GUAC_TOTP_KEY_SECRET"    : "Clear TOTP key:",
+        "FIELD_HEADER_GUAC_TOTP_RESET"         : "Clear TOTP secret:",
         "FIELD_HEADER_GUAC_TOTP_KEY_CONFIRMED" : "TOTP key confirmed:",
         
         "SECTION_HEADER_TOTP_CONFIG_FORM" : "Configure TOTP"