User two factor authentication by harikrishna-patnala · Pull Request #6924 · apache/cloudstack

harikrishna-patnala · 2022-11-28T06:04:38Z

Description

This PR introduces a new feature to add support for Two Factor Authentication 2FA in CloudStack.

The corresponding documentation PR is at apache/cloudstack-documentation#293 having all the details about the feature and how to use it.

Types of changes

Breaking change (fix or feature that would cause existing functionality to change)
New feature (non-breaking change which adds functionality)
Bug fix (non-breaking change which fixes an issue)
Enhancement (improves an existing feature and functionality)
Cleanup (Code refactoring and cleanup, that may add test cases)

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

Major
Minor

Screenshots (if appropriate):

Few sample screenshots are attached here

User login page to verify 2FA
User page to setup 2FA using google provider
User page to setup 2FA using staticpin provider
User login page to setup 2FA on the first login attempt
A new action button to enable/disable 2FA for user

harikrishna-patnala · 2022-11-28T06:53:06Z

@blueorangutan package

blueorangutan · 2022-11-28T06:54:02Z

@harikrishna-patnala a Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

blueorangutan · 2022-11-28T06:59:22Z

Packaging result: ✖️ el7 ✖️ el8 ✖️ debian ✖️ suse15. SL-JID 4654

codecov · 2022-11-28T08:17:08Z

Codecov Report

Merging #6924 (650c01d) into main (23d8981) will increase coverage by 0.03%.
The diff coverage is 35.34%.

@@             Coverage Diff              @@
##               main    #6924      +/-   ##
============================================
+ Coverage     12.63%   12.67%   +0.03%     
- Complexity     8613     8640      +27     
============================================
  Files          2711     2716       +5     
  Lines        255752   256110     +358     
  Branches      39873    39924      +51     
============================================
+ Hits          32325    32455     +130     
- Misses       219320   219527     +207     
- Partials       4107     4128      +21

Impacted Files	Coverage Δ
...ne/schema/src/main/java/com/cloud/user/UserVO.java	`42.85% <0.00%> (-4.02%)`	⬇️
...apache/cloudstack/resourcedetail/UserDetailVO.java	`40.00% <0.00%> (+40.00%)`	⬆️
.../org/apache/cloudstack/ldap/LdapAuthenticator.java	`23.91% <ø> (ø)`
...loudstack/server/auth/PBKDF2UserAuthenticator.java	`51.78% <ø> (ø)`
...he/cloudstack/auth/PlainTextUserAuthenticator.java	`0.00% <0.00%> (ø)`
...apache/cloudstack/saml/SAML2UserAuthenticator.java	`56.25% <ø> (ø)`
...tack/auth/StaticPinUserTwoFactorAuthenticator.java	`0.00% <0.00%> (ø)`
...loudstack/auth/TotpUserTwoFactorAuthenticator.java	`0.00% <0.00%> (ø)`
server/src/main/java/com/cloud/api/ApiServer.java	`1.83% <0.00%> (-0.05%)`	⬇️
...m/cloud/api/auth/APIAuthenticationManagerImpl.java	`0.00% <0.00%> (ø)`
... and 16 more

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

harikrishna-patnala · 2022-11-28T09:12:12Z

@blueorangutan package

blueorangutan · 2022-11-28T09:13:03Z

@harikrishna-patnala a Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

blueorangutan · 2022-11-28T09:18:39Z

Packaging result: ✖️ el7 ✖️ el8 ✖️ debian ✖️ suse15. SL-JID 4656

weizhouapache · 2022-11-28T10:35:32Z

@blueorangutan package

blueorangutan · 2022-11-28T10:36:02Z

@weizhouapache a Jenkins job has been kicked to build packages. It will be bundled with

SystemVM template(s). I'll keep you posted as I make progress.

blueorangutan · 2022-11-28T10:38:40Z

Packaging result: ✖️ el7 ✖️ el8 ✖️ debian ✖️ suse15. SL-JID 4657

weizhouapache · 2022-11-28T12:20:12Z

@blueorangutan package

blueorangutan · 2022-11-28T12:21:03Z

@weizhouapache a Jenkins job has been kicked to build packages. It will be bundled with

SystemVM template(s). I'll keep you posted as I make progress.

blueorangutan · 2022-11-28T12:50:22Z

Packaging result: ✔️ el7 ✖️ el8 ✔️ debian ✔️ suse15. SL-JID 4654

weizhouapache · 2022-11-28T13:27:14Z

@blueorangutan package

blueorangutan · 2022-11-28T13:28:03Z

@weizhouapache a Jenkins job has been kicked to build packages. It will be bundled with

SystemVM template(s). I'll keep you posted as I make progress.

blueorangutan · 2022-11-28T14:01:47Z

Packaging result: ✖️ el7 ✔️ el8 ✖️ debian ✔️ suse15. SL-JID 4655

weizhouapache · 2022-11-28T14:17:29Z

@blueorangutan package

blueorangutan · 2022-11-28T14:18:04Z

@weizhouapache a Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

api/src/main/java/com/cloud/user/UserAccount.java

api/src/main/java/org/apache/cloudstack/api/response/LoginCmdResponse.java

api/src/main/java/org/apache/cloudstack/auth/UserTwoFactorAuthenticator.java

blueorangutan · 2022-11-28T15:06:18Z

Packaging result: ✔️ el7 ✔️ el8 ✔️ debian ✔️ suse15. SL-JID 4656

api/src/main/java/com/cloud/user/AccountService.java

server/src/main/java/com/cloud/user/AccountManagerImpl.java

harikrishna-patnala · 2022-11-29T06:23:32Z

@blueorangutan package

blueorangutan · 2022-11-29T06:24:03Z

@harikrishna-patnala a Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

blueorangutan · 2022-11-29T07:05:23Z

Packaging result: ✔️ el7 ✖️ el8 ✔️ debian ✔️ suse15. SL-JID 4668

weizhouapache

@harikrishna-patnala
overall it looks good to me.
great job !

...static-pin/src/main/java/org/apache/cloudstack/auth/StaticPinUserTwoFactorAuthenticator.java

server/src/main/java/com/cloud/user/AccountManagerImpl.java

setup/db/22beta4to22GA.sql

ui/src/views/dashboard/Dashboard.vue

yadvr · 2023-02-10T15:46:55Z

@BryanMLima @stephankruggg Github has its own mind, I was trying to click on the re-review icon to ask you both to help review this again. Thanks.

yadvr · 2023-02-10T15:47:19Z

cc @DaanHoogland I think this is ready for merge if smoketests passes and there are no regressions. Any additional testing and review is welcome.

engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/UserDetailVO.java

server/src/main/java/com/cloud/api/auth/SetupUserTwoFactorAuthenticationCmd.java

ui/public/locales/en.json

server/src/main/java/com/cloud/user/AccountManagerImpl.java

server/src/main/java/com/cloud/api/ApiServlet.java

blueorangutan · 2023-02-11T04:36:37Z

Trillian test result (tid-6163)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 46116 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr6924-t6163-kvm-centos7.zip
Smoke tests completed. 106 look OK, 2 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File
test_router_dhcphosts	`Failure`	22.83	test_router_dhcphosts.py
test_02_deploy_vm_with_extraconfig_kvm	`Error`	1.18	test_deploy_vm_extra_config_data.py
test_03_update_vm_with_extraconfig_kvm	`Error`	0.14	test_deploy_vm_extra_config_data.py

DaanHoogland · 2023-02-11T14:25:53Z

@harikrishna-patnala can you address/answer the comments?

harikrishna-patnala · 2023-02-12T06:32:22Z

@blueorangutan package

blueorangutan · 2023-02-12T06:33:03Z

@harikrishna-patnala a Jenkins job has been kicked to build packages. It will be bundled with

SystemVM template(s). I'll keep you posted as I make progress.

blueorangutan · 2023-02-12T07:11:19Z

Packaging result: ✔️ el7 ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 5564

sonarqubecloud · 2023-02-12T07:32:48Z

SonarCloud Quality Gate failed.

0 Bugs
0 Vulnerabilities
9 Security Hotspots
27 Code Smells

34.0% Coverage
3.6% Duplication

DaanHoogland · 2023-02-12T07:49:27Z

@blueorangutan test matrix

blueorangutan · 2023-02-12T07:50:03Z

@DaanHoogland a Trillian-Jenkins matrix job (centos7 mgmt + xenserver71, rocky8 mgmt + vmware67u3, centos7 mgmt + kvmcentos7) has been kicked to run smoke tests

blueorangutan · 2023-02-12T19:21:50Z

Trillian test result (tid-6166)
Environment: xenserver-71 (x2), Advanced Networking with Mgmt server 7
Total time taken: 40310 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr6924-t6166-xenserver-71.zip
Smoke tests completed. 107 look OK, 1 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File
test_06_deploy_vm_with_extraconfig_throws_exception_xenserver	`Error`	1.22	test_deploy_vm_extra_config_data.py
test_07_deploy_vm_with_extraconfig_xenserver	`Error`	1.18	test_deploy_vm_extra_config_data.py

blueorangutan · 2023-02-12T19:32:53Z

Trillian test result (tid-6168)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 40852 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr6924-t6168-kvm-centos7.zip
Smoke tests completed. 107 look OK, 1 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File
test_02_deploy_vm_with_extraconfig_kvm	`Error`	1.22	test_deploy_vm_extra_config_data.py
test_03_update_vm_with_extraconfig_kvm	`Error`	0.17	test_deploy_vm_extra_config_data.py

blueorangutan · 2023-02-12T20:37:56Z

Trillian test result (tid-6167)
Environment: vmware-67u3 (x2), Advanced Networking with Mgmt server r8
Total time taken: 44755 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr6924-t6167-vmware-67u3.zip
Smoke tests completed. 107 look OK, 1 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File
test_04_deploy_vm_with_extraconfig_throws_exception_vmware	`Error`	1.27	test_deploy_vm_extra_config_data.py
test_05_deploy_vm_with_extraconfig_vmware	`Error`	1.22	test_deploy_vm_extra_config_data.py

yadvr · 2023-02-13T01:18:02Z

@harikrishna-patnala are the extraconfig errors related to this pr?

harikrishna-patnala · 2023-02-13T03:18:37Z

No @rohityadavcloud these are failing on main as well.

blueorangutan · 2023-02-13T10:49:21Z

Packaging result: ✔️ el7 ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 5568

boring-cyborg bot added component:api component:build component:LDAP component:networking labels Nov 28, 2022

harikrishna-patnala force-pushed the 2FA branch from 8d684c2 to 4e9fabd Compare November 28, 2022 06:09

BryanMLima reviewed Nov 28, 2022

View reviewed changes

stephankruggg reviewed Nov 28, 2022

View reviewed changes

api/src/main/java/com/cloud/user/AccountService.java Outdated Show resolved Hide resolved

server/src/main/java/com/cloud/user/AccountManagerImpl.java Outdated Show resolved Hide resolved

server/src/main/java/com/cloud/user/AccountManagerImpl.java Outdated Show resolved Hide resolved

weizhouapache reviewed Nov 29, 2022

View reviewed changes

yadvr requested review from BryanMLima and stephankruggg and removed request for BryanMLima and stephankruggg February 10, 2023 15:45

Added TOTP name in UI messages

a0ce2dd

stephankruggg reviewed Feb 10, 2023

View reviewed changes

Text and some code corrections

650c01d

DaanHoogland merged commit a3feccf into apache:main Feb 13, 2023

harikrishna-patnala mentioned this pull request Feb 22, 2023

Change 2FA plugin related global setting names #7275

Merged

10 tasks

DaanHoogland deleted the 2FA branch March 14, 2023 14:31

Conversation

harikrishna-patnala commented Nov 28, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Types of changes

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

Screenshots (if appropriate):

Uh oh!

harikrishna-patnala commented Nov 28, 2022

Uh oh!

blueorangutan commented Nov 28, 2022

Uh oh!

blueorangutan commented Nov 28, 2022

Uh oh!

codecov bot commented Nov 28, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

harikrishna-patnala commented Nov 28, 2022

Uh oh!

blueorangutan commented Nov 28, 2022

Uh oh!

blueorangutan commented Nov 28, 2022

Uh oh!

weizhouapache commented Nov 28, 2022

Uh oh!

blueorangutan commented Nov 28, 2022

Uh oh!

blueorangutan commented Nov 28, 2022

Uh oh!

weizhouapache commented Nov 28, 2022

Uh oh!

blueorangutan commented Nov 28, 2022

Uh oh!

blueorangutan commented Nov 28, 2022

Uh oh!

weizhouapache commented Nov 28, 2022

Uh oh!

blueorangutan commented Nov 28, 2022

Uh oh!

blueorangutan commented Nov 28, 2022

Uh oh!

weizhouapache commented Nov 28, 2022

Uh oh!

blueorangutan commented Nov 28, 2022

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

blueorangutan commented Nov 28, 2022

Uh oh!

Uh oh!

Uh oh!

Uh oh!

harikrishna-patnala commented Nov 29, 2022

Uh oh!

blueorangutan commented Nov 29, 2022

Uh oh!

blueorangutan commented Nov 29, 2022

Uh oh!

weizhouapache left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

yadvr commented Feb 10, 2023

Uh oh!

yadvr commented Feb 10, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

harikrishna-patnala commented Nov 28, 2022 •

edited

Loading

codecov bot commented Nov 28, 2022 •

edited

Loading

yadvr commented Feb 10, 2023 •

edited

Loading