F OpenNebula#2497: two factor authentication

Signed-off-by: Jorge Lobo <jlobo@opennebula.systems>
jloboescalona2 · Jul 4, 2019 · 28ff5c8 · 28ff5c8
1 parent f98d1f4
commit 28ff5c8
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 8 deletions.
diff --git a/install.sh b/install.sh
@@ -1930,9 +1930,9 @@ SUNSTONE_ETC_VIEW_MIXED="src/sunstone/etc/sunstone-views/mixed/admin.yaml \
 SUNSTONE_MODELS_FILES="src/sunstone/models/OpenNebulaJSON.rb \
                        src/sunstone/models/SunstoneServer.rb \
                        src/sunstone/models/SunstoneViews.rb \
-                       src/sunstone/models/my_qr_code.rb \
-                       src/sunstone/models/my_totp.rb \
-                       src/sunstone/models/two_factor_auth.rb "
+                       src/sunstone/models/OpenNebula2FA/SunstoneQRCode.rb \
+                       src/sunstone/models/OpenNebula2FA/SunstoneOPTP.rb \
+                       src/sunstone/models/OpenNebula2FA/Suntone2FAuth.rb "
 
 SUNSTONE_MODELS_JSON_FILES="src/sunstone/models/OpenNebulaJSON/HostJSON.rb \
                     src/sunstone/models/OpenNebulaJSON/ImageJSON.rb \

diff --git a/src/sunstone/models/my_totp.rb → ...tone/models/OpenNebula2FA/SunstoneOPTP.rb b/src/sunstone/models/my_totp.rb → ...tone/models/OpenNebula2FA/SunstoneOPTP.rb
diff --git a/src/sunstone/models/my_qr_code.rb → ...ne/models/OpenNebula2FA/SunstoneQRCode.rb b/src/sunstone/models/my_qr_code.rb → ...ne/models/OpenNebula2FA/SunstoneQRCode.rb
diff --git a/src/sunstone/models/two_factor_auth.rb → ...one/models/OpenNebula2FA/Suntone2FAuth.rb b/src/sunstone/models/two_factor_auth.rb → ...one/models/OpenNebula2FA/Suntone2FAuth.rb
@@ -14,7 +14,7 @@
 # limitations under the License.                                             #
 #--------------------------------------------------------------------------- #
 
-require 'my_totp'
+require 'SunstoneOPTP'
 
 # 2F Auth
 module TwoFactorAuth

diff --git a/src/sunstone/models/OpenNebulaJSON/UserJSON.rb b/src/sunstone/models/OpenNebulaJSON/UserJSON.rb
@@ -15,7 +15,7 @@
 #--------------------------------------------------------------------------- #
 
 require 'OpenNebulaJSON/JSONUtils'
-require 'two_factor_auth'
+require 'Suntone2FAuth'
 
 module OpenNebulaJSON
     class UserJSON < OpenNebula::User

diff --git a/src/sunstone/sunstone-server.rb b/src/sunstone/sunstone-server.rb
@@ -48,6 +48,7 @@
 $LOAD_PATH << RUBY_LIB_LOCATION + '/cloud'
 $LOAD_PATH << SUNSTONE_ROOT_DIR
 $LOAD_PATH << SUNSTONE_ROOT_DIR + '/models'
+$LOAD_PATH << SUNSTONE_ROOT_DIR + '/models/OpenNebula2FA'
 
 DISPLAY_NAME_XPATH = 'TEMPLATE/SUNSTONE/DISPLAY_NAME'
 TABLE_ORDER_XPATH = 'TEMPLATE/SUNSTONE/TABLE_ORDER'
@@ -98,9 +99,9 @@
 require 'uri'
 require 'open3'
 
-require "my_qr_code"
-require "my_totp"
-require "two_factor_auth"
+require "SunstoneQRCode"
+require "SunstoneOPTP"
+require "Suntone2FAuth"
 require 'CloudAuth'
 require 'SunstoneServer'
 require 'SunstoneViews'