The Unified and Autonomous Development Platform
Fix issue #391 - 2FA support
Robin Shen888a2fff24c7
diff --git a/pom.xml b/pom.xmlindex 6fac1b0075..d431c72c90 100644--- a/pom.xml+++ b/pom.xml@@ -479,6 +479,16 @@<artifactId>flexmark-ext-toc</artifactId><version>${flexmark.version}</version></dependency>+ <dependency>+ <groupId>de.taimos</groupId>+ <artifactId>totp</artifactId>+ <version>1.0</version>+ </dependency>+ <dependency>+ <groupId>com.google.zxing</groupId>+ <artifactId>javase</artifactId>+ <version>3.2.1</version>+ </dependency><dependency><groupId>org.eclipse.jgit</groupId><artifactId>org.eclipse.jgit.http.server</artifactId>diff --git a/server-core/pom.xml b/server-core/pom.xmlindex 291975ad6a..9adc0198f8 100644--- a/server-core/pom.xml+++ b/server-core/pom.xml@@ -304,6 +304,14 @@<groupId>org.dom4j</groupId><artifactId>dom4j</artifactId></dependency>+ <dependency>+ <groupId>de.taimos</groupId>+ <artifactId>totp</artifactId>+ </dependency>+ <dependency>+ <groupId>com.google.zxing</groupId>+ <artifactId>javase</artifactId>+ </dependency><dependency><groupId>org.json</groupId><artifactId>json</artifactId>diff --git a/server-core/src/main/java/io/onedev/server/maintenance/ResetAdminPassword.java b/server-core/src/main/java/io/onedev/server/maintenance/ResetAdminPassword.javaindex 4084389525..dd1adaa3f6 100644--- a/server-core/src/main/java/io/onedev/server/maintenance/ResetAdminPassword.java+++ b/server-core/src/main/java/io/onedev/server/maintenance/ResetAdminPassword.java@@ -64,6 +64,7 @@ public class ResetAdminPassword extends DefaultPersistManager {}String password = Bootstrap.command.getArgs()[0];root.setPassword(passwordService.encryptPassword(password));+ root.setTwoFactorAuthentication(null);userManager.save(root);// wait for a short period to have embedded db flushing datadiff --git a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.javaindex 27b1205aba..b3fafd4e85 100644--- a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java+++ b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java@@ -3796,7 +3796,7 @@ public class DataMigrator {}}- // Migrate to 7.0.0+ // Migrate to 6.4.0private void migrate82(File dataDir, Stack<Integer> versions) {for (File file: dataDir.listFiles()) {if (file.getName().startsWith("Builds.xml")) {@@ -3804,6 +3804,21 @@ public class DataMigrator {for (Element element: dom.getRootElement().elements())element.element("triggerChain").setName("pipeline");dom.writeToFile(file, false);+ } else if (file.getName().startsWith("Settings.xml")) {+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ if (element.elementTextTrim("key").equals("SECURITY")) {+ Element valueElement = element.element("value");+ if (valueElement != null)+ valueElement.addElement("enforce2FA").setText("false");+ }+ }+ dom.writeToFile(file, false);+ } else if (file.getName().startsWith("Groups.xml")) {+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);+ for (Element element: dom.getRootElement().elements())+ element.addElement("enforce2FA").setText("false");+ dom.writeToFile(file, false);}}}diff --git a/server-core/src/main/java/io/onedev/server/model/Group.java b/server-core/src/main/java/io/onedev/server/model/Group.javaindex da13e90f47..a107e451ab 100644--- a/server-core/src/main/java/io/onedev/server/model/Group.java+++ b/server-core/src/main/java/io/onedev/server/model/Group.java@@ -33,6 +33,8 @@ public class Group extends AbstractEntity {private boolean createRootProjects;+ private boolean enforce2FA;+@OneToMany(mappedBy="group", cascade=CascadeType.REMOVE)@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)private Collection<GroupAuthorization> authorizations = new ArrayList<>();@@ -86,6 +88,17 @@ public class Group extends AbstractEntity {this.createRootProjects = createRootProjects;}+ @Editable(order=400, name="Enforce Two-factor Authentication", description="Check this to enforce "+ + "all users in this group to set up two-factor authentication upon next login. Users will "+ + "not be able to disable two-factor authentication themselves if this option is set")+ public boolean isEnforce2FA() {+ return enforce2FA;+ }++ public void setEnforce2FA(boolean enforce2FA) {+ this.enforce2FA = enforce2FA;+ }+public Collection<GroupAuthorization> getAuthorizations() {return authorizations;}diff --git a/server-core/src/main/java/io/onedev/server/model/User.java b/server-core/src/main/java/io/onedev/server/model/User.javaindex 9e4bd90ebb..7a55e9d99f 100644--- a/server-core/src/main/java/io/onedev/server/model/User.java+++ b/server-core/src/main/java/io/onedev/server/model/User.java@@ -44,6 +44,7 @@ import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.support.NamedProjectQuery;import io.onedev.server.model.support.QueryPersonalization;import io.onedev.server.model.support.SsoInfo;+import io.onedev.server.model.support.TwoFactorAuthentication;import io.onedev.server.model.support.administration.authenticator.Authenticator;import io.onedev.server.model.support.administration.sso.SsoConnector;import io.onedev.server.model.support.build.NamedBuildQuery;@@ -141,6 +142,11 @@ public class User extends AbstractEntity implements AuthenticationInfo {@Column(unique=true, nullable=false)private String accessToken = RandomStringUtils.randomAlphanumeric(ACCESS_TOKEN_LEN);+ @JsonIgnore+ @Lob+ @Column(length=65535)+ private TwoFactorAuthentication twoFactorAuthentication;+@OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)private Collection<UserAuthorization> authorizations = new ArrayList<>();@@ -476,6 +482,15 @@ public class User extends AbstractEntity implements AuthenticationInfo {this.accessToken = accessToken;}+ @Nullable+ public TwoFactorAuthentication getTwoFactorAuthentication() {+ return twoFactorAuthentication;+ }++ public void setTwoFactorAuthentication(TwoFactorAuthentication twoFactorAuthentication) {+ this.twoFactorAuthentication = twoFactorAuthentication;+ }+@Editable(order=300)@NotEmpty@@ -790,5 +805,10 @@ public class User extends AbstractEntity implements AuthenticationInfo {public void setBuildQuerySubscriptions(LinkedHashSet<String> buildQuerySubscriptions) {this.buildQuerySubscriptions = buildQuerySubscriptions;}++ public boolean isEnforce2FA() {+ return OneDev.getInstance(SettingManager.class).getSecuritySetting().isEnforce2FA()+ || getGroups().stream().anyMatch(it->it.isEnforce2FA());+ }}diff --git a/server-core/src/main/java/io/onedev/server/model/support/TwoFactorAuthentication.java b/server-core/src/main/java/io/onedev/server/model/support/TwoFactorAuthentication.javanew file mode 100644index 0000000000..1afb5ba9dd--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/support/TwoFactorAuthentication.java@@ -0,0 +1,73 @@+package io.onedev.server.model.support;++import java.io.IOException;+import java.io.OutputStream;+import java.io.Serializable;+import java.io.UnsupportedEncodingException;+import java.net.MalformedURLException;+import java.net.URL;+import java.net.URLEncoder;+import java.util.List;++import org.apache.commons.codec.binary.Base32;+import org.apache.commons.codec.binary.Hex;++import com.google.zxing.BarcodeFormat;+import com.google.zxing.MultiFormatWriter;+import com.google.zxing.WriterException;+import com.google.zxing.client.j2se.MatrixToImageWriter;+import com.google.zxing.common.BitMatrix;++import de.taimos.totp.TOTP;+import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.model.User;++public class TwoFactorAuthentication implements Serializable {++ private static final long serialVersionUID = 1L;++ private final String secretKey;++ private final List<String> scratchCodes;++ public TwoFactorAuthentication(String secretKey, List<String> scratchCodes) {+ this.secretKey = secretKey;+ this.scratchCodes = scratchCodes;+ }++ public String getSecretKey() {+ return secretKey;+ }++ public List<String> getScratchCodes() {+ return scratchCodes;+ }++ public String getTOTPCode() {+ Base32 base32 = new Base32();+ byte[] bytes = base32.decode(secretKey);+ String hexKey = Hex.encodeHexString(bytes);+ return TOTP.getOTP(hexKey);+ }++ public void writeQRCode(User user, int size, OutputStream os) {+ String barCode;+ try {+ String serverUrl = OneDev.getInstance(SettingManager.class).getSystemSetting().getServerUrl();+ String issuer = "OneDev@" + new URL(serverUrl).getHost();+ barCode = "otpauth://totp/"+ + URLEncoder.encode(issuer + ":" + user.getName(), "UTF-8").replace("+", "%20")+ + "?secret=" + URLEncoder.encode(secretKey, "UTF-8").replace("+", "%20")+ + "&issuer=" + URLEncoder.encode(issuer, "UTF-8").replace("+", "%20");+ } catch (UnsupportedEncodingException | MalformedURLException e) {+ throw new RuntimeException(e);+ }+ try {+ BitMatrix matrix = new MultiFormatWriter().encode(barCode, BarcodeFormat.QR_CODE, size, size);+ MatrixToImageWriter.writeToStream(matrix, "png", os);+ } catch (WriterException | IOException e) {+ throw new RuntimeException(e);+ }+ }+}diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/SecuritySetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/SecuritySetting.javaindex d9cacd5336..300a81ffdf 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/SecuritySetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/SecuritySetting.java@@ -27,6 +27,8 @@ public class SecuritySetting implements Serializable {private String defaultLoginGroupName;+ private boolean enforce2FA;+@Editable(order=100, description="Whether or not to allow anonymous users to access this server")public boolean isEnableAnonymousAccess() {return enableAnonymousAccess;@@ -56,6 +58,17 @@ public class SecuritySetting implements Serializable {this.defaultLoginGroupName = defaultLoginGroupName;}+ @Editable(order=400, name="Enforce Two-factor Authentication", description="Check this to enforce "+ + "all users to set up two-factor authentication upon next login. Users will not be able "+ + "to disable two-factor authentication themselves if this option is set")+ public boolean isEnforce2FA() {+ return enforce2FA;+ }++ public void setEnforce2FA(boolean enforce2FA) {+ this.enforce2FA = enforce2FA;+ }+@Nullablepublic Group getDefaultLoginGroup() {if (defaultLoginGroupName != null) {diff --git a/server-core/src/main/java/io/onedev/server/security/SecurityUtils.java b/server-core/src/main/java/io/onedev/server/security/SecurityUtils.javaindex 7a6a4b25cc..65a08aaf85 100644--- a/server-core/src/main/java/io/onedev/server/security/SecurityUtils.java+++ b/server-core/src/main/java/io/onedev/server/security/SecurityUtils.java@@ -88,6 +88,15 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {return null;}+ @Nullable+ public static User toUser(PrincipalCollection principals) {+ Long userId = (Long) principals.getPrimaryPrincipal();+ if (!userId.equals(0L))+ return OneDev.getInstance(UserManager.class).load(userId);+ else+ return null;+ }+public static Long getUserId() {Object principal = SecurityUtils.getSubject().getPrincipal();Preconditions.checkNotNull(principal);@@ -316,8 +325,12 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {}public static Subject asSubject(Long userId) {+ return asSubject(asPrincipal(userId));+ }++ public static Subject asSubject(PrincipalCollection principals) {WebSecurityManager securityManager = AppLoader.getInstance(WebSecurityManager.class);- return new Subject.Builder(securityManager).principals(asPrincipal(userId)).buildSubject();+ return new Subject.Builder(securityManager).principals(principals).buildSubject();}public static Subject asAnonymous() {diff --git a/server-core/src/main/java/io/onedev/server/web/BaseUrlMapper.java b/server-core/src/main/java/io/onedev/server/web/BaseUrlMapper.javaindex 7ec88ca3bf..d3272fda34 100644--- a/server-core/src/main/java/io/onedev/server/web/BaseUrlMapper.java+++ b/server-core/src/main/java/io/onedev/server/web/BaseUrlMapper.java@@ -55,6 +55,7 @@ import io.onedev.server.web.page.admin.user.membership.UserMembershipsPage;import io.onedev.server.web.page.admin.user.password.UserPasswordPage;import io.onedev.server.web.page.admin.user.profile.UserProfilePage;import io.onedev.server.web.page.admin.user.ssh.UserSshKeysPage;+import io.onedev.server.web.page.admin.user.twofactorauthentication.UserTwoFactorAuthenticationPage;import io.onedev.server.web.page.builds.BuildListPage;import io.onedev.server.web.page.help.IncompatibilitiesPage;import io.onedev.server.web.page.help.MethodDetailPage;@@ -66,6 +67,7 @@ import io.onedev.server.web.page.my.avatar.MyAvatarPage;import io.onedev.server.web.page.my.password.MyPasswordPage;import io.onedev.server.web.page.my.profile.MyProfilePage;import io.onedev.server.web.page.my.sshkeys.MySshKeysPage;+import io.onedev.server.web.page.my.twofactorauthentication.MyTwoFactorAuthenticationPage;import io.onedev.server.web.page.project.NewProjectPage;import io.onedev.server.web.page.project.ProjectListPage;import io.onedev.server.web.page.project.blob.ProjectBlobPage;@@ -176,6 +178,7 @@ public class BaseUrlMapper extends CompoundRequestMapper {add(new DynamicPathPageMapper("my/password", MyPasswordPage.class));add(new DynamicPathPageMapper("my/ssh-keys", MySshKeysPage.class));add(new DynamicPathPageMapper("my/access-token", MyAccessTokenPage.class));+ add(new DynamicPathPageMapper("my/two-factor-authentication", MyTwoFactorAuthenticationPage.class));}private void addResources() {@@ -224,6 +227,7 @@ public class BaseUrlMapper extends CompoundRequestMapper {add(new DynamicPathPageMapper("administration/users/${user}/password", UserPasswordPage.class));add(new DynamicPathPageMapper("administration/users/${user}/ssh-keys", UserSshKeysPage.class));add(new DynamicPathPageMapper("administration/users/${user}/access-token", UserAccessTokenPage.class));+ add(new DynamicPathPageMapper("administration/users/${user}/two-factor-authentication", UserTwoFactorAuthenticationPage.class));add(new DynamicPathPageMapper("administration/roles", RoleListPage.class));add(new DynamicPathPageMapper("administration/roles/new", NewRolePage.class));diff --git a/server-core/src/main/java/io/onedev/server/web/asset/bootstrap/css/bootstrap-custom.css b/server-core/src/main/java/io/onedev/server/web/asset/bootstrap/css/bootstrap-custom.cssindex d5367720b6..83cefc14ed 100644--- a/server-core/src/main/java/io/onedev/server/web/asset/bootstrap/css/bootstrap-custom.css+++ b/server-core/src/main/java/io/onedev/server/web/asset/bootstrap/css/bootstrap-custom.css@@ -132,11 +132,18 @@ a.link-info:hover, a.link-info:focus {color: rgb(176, 142, 255) !important;}.text-secondary, a.link-secondary {- color: var(--dark) !important;+ color: var(--gray-dark) !important;}a.link-secondary:hover, a.link-secondary:focus {- color: #b4bad3 !important;+ color: var(--gray) !important;+}+.dark-mode .text-secondary, .dark-mode a.link-secondary {+ color: var(--light-gray) !important;+}+.dark-mode a.link-secondary:hover, .dark-mode a.link-secondary:focus {+ color: var(--dark-mode-gray) !important;}+.text-light, a.link-light {color: var(--light) !important;}diff --git a/server-core/src/main/java/io/onedev/server/web/asset/icon/shield.svg b/server-core/src/main/java/io/onedev/server/web/asset/icon/shield.svgindex 6178d3c32a..9f75ec50ed 100644--- a/server-core/src/main/java/io/onedev/server/web/asset/icon/shield.svg+++ b/server-core/src/main/java/io/onedev/server/web/asset/icon/shield.svg@@ -1,4 +1 @@-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">-<svg class="icon" width="200px" height="200.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg">- <path d='M837.546667 155.733333a42.666667 42.666667 0 0 0-35.84-8.533333 341.333333 341.333333 0 0 1-265.386667-54.186667 42.666667 42.666667 0 0 0-48.64 0 341.333333 341.333333 0 0 1-265.386667 54.186667 42.666667 42.666667 0 0 0-35.84 8.533333 42.666667 42.666667 0 0 0-15.786666 33.28v317.866667a384 384 0 0 0 160.853333 312.746667l155.733333 110.933333a42.666667 42.666667 0 0 0 49.493334 0l155.733333-110.933333A384 384 0 0 0 853.333333 506.88V189.013333a42.666667 42.666667 0 0 0-15.786666-33.28zM768 506.88a298.666667 298.666667 0 0 1-125.013333 243.2L512 843.52l-130.986667-93.44A298.666667 298.666667 0 0 1 256 506.88v-268.8a426.666667 426.666667 0 0 0 256-59.306667 426.666667 426.666667 0 0 0 256 59.306667z' />-</svg>\ No newline at end of file+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1647236329826" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2630" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M512 150.84C584.07 219.89 689.35 247 808.2 277.6c6.85 1.76 13.79 3.55 20.8 5.36v107.98c0 60.37-8.2 121.12-24.38 180.57-15.81 58.09-38.31 111.62-66.86 159.11-28.26 47-60.78 85.24-96.64 113.65-35.34 28-72.49 45.13-110.43 50.92l-15.97 2.44-20.7-3.11c-38.02-5.72-75.25-22.8-110.67-50.77-35.94-28.38-68.53-66.61-96.86-113.63-28.63-47.5-51.18-101.07-67.04-159.2C203.23 511.42 195 450.6 195 390.16V282.97c7.01-1.82 13.96-3.6 20.81-5.37C334.66 247 439.94 219.89 512 150.84m0-89.19c-5.69 0-11.38 2.74-15.06 8.21-63.6 94.8-190.94 117.22-352.06 160.08-8.16 2.17-13.88 9.84-13.88 18.65v141.58c0 268.29 150.63 537.14 353.51 567.64l30.28 4.55 25.55-3.9C742.83 927.57 893 658.9 893 390.95V248.59c0-8.81-5.73-16.48-13.88-18.65C718 187.08 590.66 164.66 527.06 69.86c-3.67-5.48-9.37-8.21-15.06-8.21z" p-id="2631"></path><path d="M504.15 654.85a32.03 32.03 0 0 1-22.42-9.16L326.21 493.02c-12.61-12.38-12.8-32.64-0.42-45.25s32.64-12.8 45.25-0.42l131.78 129.36 192.86-212.37c11.88-13.08 32.12-14.06 45.2-2.18 13.08 11.88 14.06 32.12 2.18 45.2l-215.23 237a32 32 0 0 1-22.77 10.47c-0.3 0.02-0.61 0.02-0.91 0.02z" p-id="2632"></path></svg>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/twofactorauthentication/TwoFactorAuthenticationSetupPanel.html b/server-core/src/main/java/io/onedev/server/web/component/twofactorauthentication/TwoFactorAuthenticationSetupPanel.htmlnew file mode 100644index 0000000000..16b273b845--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/twofactorauthentication/TwoFactorAuthenticationSetupPanel.html@@ -0,0 +1,59 @@+<wicket:panel>+ <div wicket:id="content" class="setup-2fa"></div>+ <wicket:fragment wicket:id="pendingVerifyFrag">+ <form wicket:id="form">+ <div class="modal-header">+ <h5 id="modal-title" class="modal-title">Set Up Two-factor Authentication</h5>+ <button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>+ </div>+ <div class="modal-body">+ <div wicket:id="enforceNotice" class="alert alert-light-warning">Two-factor authentication is enforced+ for your account to enhance security. Please follow below procedure to set it up</div>+ <div class="text-secondary font-weight-boldest">+ 1. Scan below QR code with your TOTP authenticators+ </div>+ <div>These authenticators normally run+ on your mobile phone, some examples are Google Authenticator, Microsoft Authenticator, Authy, 1Password etc.</div>++ <div class="d-flex justify-content-center my-3">+ <img wicket:id="QRCode">+ </div>++ <div class="text-secondary font-weight-boldest">+ 2. Then enter the passcode shown in the TOTP authenticator to verify+ </div>+ <input wicket:id="passcode" placeholder="6-digits passcode" class="form-control mt-2">+ <div wicket:id="feedback" class="mb-n3 mt-3"></div>+ </div>+ <div class="modal-footer">+ <input wicket:id="verify" type="submit" class="dirty-aware btn btn-primary" value="Verify">+ <a wicket:id="cancel" class="btn btn-secondary">Cancel</a>+ </div>+ </form>+ </wicket:fragment>+ <wicket:fragment wicket:id="verifiedFrag">+ <div class="modal-header">+ <h5 id="modal-title" class="modal-title">Set Up Two-factor Authentication</h5>+ <button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>+ </div>+ <div class="modal-body">+ <div class="alert alert-light-success font-weight-bolder"><wicket:svg href="tick-circle" class="icon"/> Two-factor authentication is now enabled for your account</div>++ <div class="mb-3">+ <b class="text-danger">IMPORTANT:</b> Please <a wicket:id="download" class="font-weight-bolder">download</a>+ recovery codes below and keep+ them secret. These codes can be used to provide one-time access to your account in case you+ can not access the authentication application. They will <b>NOT</b> be displayed again+ </div>+ <div class="mx-5">+ <div wicket:id="recoveryCodes" class="d-flex justify-content-between text-monospace font-size-lg font-weight-bold">+ <div wicket:id="left"></div>+ <div wicket:id="right"></div>+ </div>+ </div>+ </div>+ <div class="modal-footer d-flex justify-content-center">+ <a wicket:id="ok" class="btn btn-primary">Ok</a>+ </div>+ </wicket:fragment>+</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/twofactorauthentication/TwoFactorAuthenticationSetupPanel.java b/server-core/src/main/java/io/onedev/server/web/component/twofactorauthentication/TwoFactorAuthenticationSetupPanel.javanew file mode 100644index 0000000000..8e82895735--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/twofactorauthentication/TwoFactorAuthenticationSetupPanel.java@@ -0,0 +1,214 @@+package io.onedev.server.web.component.twofactorauthentication;++import java.io.IOException;+import java.security.SecureRandom;+import java.util.ArrayList;+import java.util.List;++import org.apache.commons.codec.binary.Base32;+import org.apache.commons.lang3.RandomStringUtils;+import org.apache.tika.mime.MediaType;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.ajax.markup.html.form.AjaxButton;+import org.apache.wicket.feedback.FencedFeedbackPanel;+import org.apache.wicket.markup.ComponentTag;+import org.apache.wicket.markup.html.WebMarkupContainer;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.form.Form;+import org.apache.wicket.markup.html.form.TextField;+import org.apache.wicket.markup.html.image.Image;+import org.apache.wicket.markup.html.link.ResourceLink;+import org.apache.wicket.markup.html.panel.Fragment;+import org.apache.wicket.markup.html.panel.GenericPanel;+import org.apache.wicket.markup.repeater.RepeatingView;+import org.apache.wicket.model.Model;+import org.apache.wicket.request.resource.AbstractResource;+import org.apache.wicket.request.resource.ContentDisposition;++import io.onedev.commons.utils.StringUtils;+import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.UserManager;+import io.onedev.server.model.User;+import io.onedev.server.model.support.TwoFactorAuthentication;+import io.onedev.server.web.page.simple.security.LoginPage;++@SuppressWarnings("serial")+public abstract class TwoFactorAuthenticationSetupPanel extends GenericPanel<User> {++ private static final int QR_CODE_SIZE = 160;++ public TwoFactorAuthenticationSetupPanel(String id) {+ super(id);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ String secretKey = generateSecretKey();++ List<String> scratchCodes = new ArrayList<>();+ for (int i=0; i<16; i++)+ scratchCodes.add(RandomStringUtils.randomAlphanumeric(12));++ TwoFactorAuthentication authentication = new TwoFactorAuthentication(secretKey, scratchCodes);++ Fragment fragment = new Fragment("content", "pendingVerifyFrag", this);+ Form<?> form = new Form<Void>("form");++ form.add(new WebMarkupContainer("enforceNotice") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(getPage() instanceof LoginPage);+ }++ });++ form.add(new Image("QRCode", new AbstractResource() {++ @Override+ protected ResourceResponse newResourceResponse(Attributes attributes) {+ ResourceResponse response = new ResourceResponse();+ response.setContentType(MediaType.image("png").toString());+ response.disableCaching();++ response.setWriteCallback(new WriteCallback() {++ @Override+ public void writeData(Attributes attributes) throws IOException {+ authentication.writeQRCode(getUser(), QR_CODE_SIZE,+ attributes.getResponse().getOutputStream());+ }++ });+ return response;+ }++ }) {++ @Override+ protected void onComponentTag(ComponentTag tag) {+ super.onComponentTag(tag);+ tag.put("width", QR_CODE_SIZE + "px");+ tag.put("height", QR_CODE_SIZE + "px");+ }++ });++ TextField<String> input = new TextField<String>("passcode", Model.of(""));+ form.add(input);+ form.add(new FencedFeedbackPanel("feedback", form));+ form.add(new AjaxButton("verify") {++ @Override+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {+ super.onSubmit(target, form);+ String passcode = input.getModelObject();+ if (StringUtils.isBlank(passcode)) {+ form.error("Please input passcode");+ target.add(form);+ } else if (!passcode.equals(authentication.getTOTPCode())) {+ form.error("Passcode incorrect");+ target.add(form);+ } else {+ getUser().setTwoFactorAuthentication(authentication);+ OneDev.getInstance(UserManager.class).save(getUser());++ Fragment fragment = new Fragment("content", "verifiedFrag", TwoFactorAuthenticationSetupPanel.this);+ RepeatingView recoveryCodesView = new RepeatingView("recoveryCodes");+ for (int i=0; i<authentication.getScratchCodes().size()/2; i++) {+ WebMarkupContainer container = new WebMarkupContainer(recoveryCodesView.newChildId());+ container.add(new Label("left", authentication.getScratchCodes().get(i*2)));+ container.add(new Label("right", authentication.getScratchCodes().get(i*2+1)));+ recoveryCodesView.add(container);+ }+ fragment.add(recoveryCodesView);+ fragment.add(new ResourceLink<Void>("download", new AbstractResource() {++ @Override+ protected ResourceResponse newResourceResponse(Attributes attributes) {+ ResourceResponse response = new ResourceResponse();+ response.setContentType(MediaType.TEXT_PLAIN.toString());+ response.setFileName("onedev-recovery-codes.txt");+ response.setContentDisposition(ContentDisposition.ATTACHMENT);+ response.disableCaching();++ response.setWriteCallback(new WriteCallback() {++ @Override+ public void writeData(Attributes attributes) throws IOException {+ String content = StringUtils.join(authentication.getScratchCodes(), "\n");+ attributes.getResponse().write(content);+ }++ });+ return response;+ }++ }));+ fragment.add(new AjaxLink<Void>("ok") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ onEnabled(target);+ }++ });+ fragment.add(new AjaxLink<Void>("close") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ onEnabled(target);+ }++ });+ TwoFactorAuthenticationSetupPanel.this.replace(fragment);+ target.add(fragment);+ }+ }++ });+ form.add(new AjaxLink<Void>("cancel") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ onCancelled(target);+ }++ });++ form.add(new AjaxLink<Void>("close") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ onCancelled(target);+ }++ });++ form.setOutputMarkupId(true);++ fragment.add(form);++ fragment.setOutputMarkupId(true);+ add(fragment);+ }++ public static String generateSecretKey() {+ SecureRandom random = new SecureRandom();+ byte[] bytes = new byte[20];+ random.nextBytes(bytes);+ Base32 base32 = new Base32();+ return base32.encodeToString(bytes);+ }++ protected abstract User getUser();++ protected abstract void onEnabled(AjaxRequestTarget target);++ protected abstract void onCancelled(AjaxRequestTarget target);++}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorPage.javaindex 3c1fc212cc..4b1232f279 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorPage.java@@ -143,26 +143,26 @@ public class AuthenticatorPage extends AdministrationPage {if (authenticated.getFullName() != null) {retrievedInfoBuilder.append("Full Name: ").append(authenticated.getFullName())- .append("\n");+ .append("<br>");}if (authenticated.getEmail() != null) {retrievedInfoBuilder.append("Email: ").append(authenticated.getEmail())- .append("\n");+ .append("<br>");}if (authenticated.getGroupNames() != null) {retrievedInfoBuilder.append("Groups: ").append(Joiner.on(", ").join(authenticated.getGroupNames()))- .append("\n");+ .append("<br>");}if (authenticated.getSshKeys() != null) {retrievedInfoBuilder.append("Number of SSH Keys: ").append(authenticated.getSshKeys().size())- .append("\n");+ .append("<br>");}StringBuilder messageBuilder =new StringBuilder("Test successful: authentication passed");if (retrievedInfoBuilder.length() != 0) {- messageBuilder.append(" with below information retrieved:\n")+ messageBuilder.append(" with below information retrieved:<br>").append(retrievedInfoBuilder);}return messageBuilder.toString();diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/sso/SsoConnectorListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/sso/SsoConnectorListPage.javaindex fc2dd93bee..1db60103b4 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/sso/SsoConnectorListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/sso/SsoConnectorListPage.java@@ -233,7 +233,7 @@ public class SsoConnectorListPage extends AdministrationPage {@Overrideprotected Component newTopbarTitle(String componentId) {- return new Label(componentId, "<span class='text-truncate'>Single Sign On Providers</span>").setEscapeModelStrings(false);+ return new Label(componentId, "<span class='text-truncate'>Single Sign On</span>").setEscapeModelStrings(false);}}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.javaindex 476ceb95a3..723dbf5fc6 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.java@@ -30,6 +30,7 @@ import io.onedev.server.web.page.admin.user.membership.UserMembershipsPage;import io.onedev.server.web.page.admin.user.password.UserPasswordPage;import io.onedev.server.web.page.admin.user.profile.UserProfilePage;import io.onedev.server.web.page.admin.user.ssh.UserSshKeysPage;+import io.onedev.server.web.page.admin.user.twofactorauthentication.UserTwoFactorAuthenticationPage;@SuppressWarnings("serial")public abstract class UserPage extends AdministrationPage {@@ -72,6 +73,7 @@ public abstract class UserPage extends AdministrationPage {tabs.add(new UserTab("Authorized Projects", "project", UserAuthorizationsPage.class));tabs.add(new UserTab("SSH Keys", "key", UserSshKeysPage.class));tabs.add(new UserTab("Access Token", "token", UserAccessTokenPage.class));+ tabs.add(new UserTab("Two-factor Authentication", "shield", UserTwoFactorAuthenticationPage.class));add(new Tabbable("userTabs", tabs));}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/twofactorauthentication/UserTwoFactorAuthenticationPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/user/twofactorauthentication/UserTwoFactorAuthenticationPage.htmlnew file mode 100644index 0000000000..d356ab7bdb--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/twofactorauthentication/UserTwoFactorAuthenticationPage.html@@ -0,0 +1,15 @@+<wicket:extend>+ <div wicket:id="content"></div>+ <wicket:fragment wicket:id="disabledFrag">+ <div class="alert alert-notice alert-light-warning mb-0">+ Two-factor authentication enhances account security.+ It is currently disabled, and can only be enabled by user+ </div>+ </wicket:fragment>+ <wicket:fragment wicket:id="enabledFrag">+ <div class="alert alert-notice alert-light-success mb-4">+ Two-factor authentication is enabled for this account+ </div>+ <a wicket:id="disable" class="btn btn-danger">Disable</a>+ </wicket:fragment>+</wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/twofactorauthentication/UserTwoFactorAuthenticationPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/twofactorauthentication/UserTwoFactorAuthenticationPage.javanew file mode 100644index 0000000000..9527e82a84--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/twofactorauthentication/UserTwoFactorAuthenticationPage.java@@ -0,0 +1,69 @@+package io.onedev.server.web.page.admin.user.twofactorauthentication;++import org.apache.wicket.Component;+import org.apache.wicket.Session;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.panel.Fragment;+import org.apache.wicket.request.mapper.parameter.PageParameters;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.UserManager;+import io.onedev.server.web.ajaxlistener.ConfirmClickListener;+import io.onedev.server.web.page.admin.user.UserPage;++@SuppressWarnings("serial")+public class UserTwoFactorAuthenticationPage extends UserPage {++ public UserTwoFactorAuthenticationPage(PageParameters params) {+ super(params);+ }++ private UserManager getUserManager() {+ return OneDev.getInstance(UserManager.class);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ if (getUser().getSsoInfo().getConnector() != null) {+ add(new Label("content", "This account is currently authenticated via SSO provider '"+ + getUser().getSsoInfo().getConnector() + "', "+ + "and two-factor authentication should be configured there")+ .add(AttributeAppender.append("class", "alert alert-light-warning alert-notice mb-0")));+ } else if (getUser().getTwoFactorAuthentication() != null) {+ Fragment fragment = new Fragment("content", "enabledFrag", this);+ fragment.add(new AjaxLink<Void>("disable") {++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ attributes.getAjaxCallListeners().add(new ConfirmClickListener(+ "Do you really want to disable two-factor authentication for this account?"));+ }++ @Override+ public void onClick(AjaxRequestTarget target) {+ getUser().setTwoFactorAuthentication(null);+ getUserManager().save(getUser());+ Session.get().success("Two-factor authentication disabled");+ setResponsePage(UserTwoFactorAuthenticationPage.class, UserTwoFactorAuthenticationPage.paramsOf(getUser()));+ }++ });+ add(fragment);+ } else {+ add(new Fragment("content", "disabledFrag", this));+ }+ }++ @Override+ protected Component newTopbarTitle(String componentId) {+ return new Label(componentId, "Two Factor Authentication");+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.htmlindex 9b279dd531..f751a90cdb 100644--- a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html@@ -71,6 +71,10 @@<wicket:svg href="token" class="icon mr-2"></wicket:svg>Access Token</a>+ <a wicket:id="myTwoFactorAuthentication" class="dropdown-item">+ <wicket:svg href="shield" class="icon mr-2"></wicket:svg>+ Two-factor Authentication+ </a><a wicket:id="signOut" class="dropdown-item"><wicket:svg href="logout" class="icon mr-2"></wicket:svg><span wicket:id="label"></span>diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.javaindex 9b130cb972..d6cb53a8fa 100644--- a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java@@ -85,6 +85,7 @@ import io.onedev.server.web.page.my.avatar.MyAvatarPage;import io.onedev.server.web.page.my.password.MyPasswordPage;import io.onedev.server.web.page.my.profile.MyProfilePage;import io.onedev.server.web.page.my.sshkeys.MySshKeysPage;+import io.onedev.server.web.page.my.twofactorauthentication.MyTwoFactorAuthenticationPage;import io.onedev.server.web.page.project.ProjectListPage;import io.onedev.server.web.page.simple.security.LoginPage;import io.onedev.server.web.page.simple.security.LogoutPage;@@ -135,10 +136,8 @@ public abstract class LayoutPage extends BasePage {GeneralSecuritySettingPage.class, new PageParameters()));securitySettingMenuItems.add(new SidebarMenuItem.Page(null, "External Authentication",AuthenticatorPage.class, new PageParameters()));- securitySettingMenuItems.add(new SidebarMenuItem.Page(null, "SSO Providers",+ securitySettingMenuItems.add(new SidebarMenuItem.Page(null, "Single Sign On",SsoConnectorListPage.class, new PageParameters()));- securitySettingMenuItems.add(new SidebarMenuItem.Page(null, "SSH Setting",- SshSettingPage.class, new PageParameters()));administrationMenuItems.add(new SidebarMenuItem.SubMenu(null, "Security Setting", securitySettingMenuItems));@@ -156,6 +155,9 @@ public abstract class LayoutPage extends BasePage {issueSettingMenuItems.add(new SidebarMenuItem.Page(null, "Description Templates",IssueTemplateListPage.class, new PageParameters()));+ administrationMenuItems.add(new SidebarMenuItem.Page(null, "SSH Setting",+ SshSettingPage.class, new PageParameters()));+administrationMenuItems.add(new SidebarMenuItem.SubMenu(null, "Issue Setting", issueSettingMenuItems));administrationMenuItems.add(new SidebarMenuItem.Page(null, "Job Executors",@@ -378,6 +380,10 @@ public abstract class LayoutPage extends BasePage {if (getPage() instanceof MyAccessTokenPage)item.add(AttributeAppender.append("class", "active"));+ userInfo.add(item = new ViewStateAwarePageLink<Void>("myTwoFactorAuthentication", MyTwoFactorAuthenticationPage.class));+ if (getPage() instanceof MyTwoFactorAuthenticationPage)+ item.add(AttributeAppender.append("class", "active"));+PrincipalCollection prevPrincipals = SecurityUtils.getSubject().getPreviousPrincipals();if (prevPrincipals != null && !prevPrincipals.getPrimaryPrincipal().equals(0L)) {Link<Void> signOutLink = new Link<Void>("signOut") {diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/twofactorauthentication/MyTwoFactorAuthenticationPage.html b/server-core/src/main/java/io/onedev/server/web/page/my/twofactorauthentication/MyTwoFactorAuthenticationPage.htmlnew file mode 100644index 0000000000..2015939891--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/my/twofactorauthentication/MyTwoFactorAuthenticationPage.html@@ -0,0 +1,18 @@+<wicket:extend>+ <div class="card m-2 m-sm-5">+ <div class="card-body">+ <div wicket:id="content"></div>+ </div>+ </div>+ <wicket:fragment wicket:id="disabledFrag">+ <div class="alert alert-notice alert-light-warning mb-4">+ Two-factor authentication enhances your account security.+ It is currently disabled.+ </div>+ <a wicket:id="enable" class="btn btn-primary">Enable</a>+ </wicket:fragment>+ <wicket:fragment wicket:id="enabledFrag">+ <div wicket:id="message" class="alert alert-notice alert-light-success mb-4"></div>+ <a wicket:id="disable" class="btn btn-danger">Disable</a>+ </wicket:fragment>+</wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/my/twofactorauthentication/MyTwoFactorAuthenticationPage.java b/server-core/src/main/java/io/onedev/server/web/page/my/twofactorauthentication/MyTwoFactorAuthenticationPage.javanew file mode 100644index 0000000000..13b2158fa4--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/my/twofactorauthentication/MyTwoFactorAuthenticationPage.java@@ -0,0 +1,121 @@+package io.onedev.server.web.page.my.twofactorauthentication;++import org.apache.wicket.Component;+import org.apache.wicket.Session;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.panel.Fragment;+import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.request.mapper.parameter.PageParameters;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.UserManager;+import io.onedev.server.model.User;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.web.ajaxlistener.ConfirmClickListener;+import io.onedev.server.web.component.modal.ModalLink;+import io.onedev.server.web.component.modal.ModalPanel;+import io.onedev.server.web.component.twofactorauthentication.TwoFactorAuthenticationSetupPanel;+import io.onedev.server.web.page.my.MyPage;++@SuppressWarnings("serial")+public class MyTwoFactorAuthenticationPage extends MyPage {++ public MyTwoFactorAuthenticationPage(PageParameters params) {+ super(params);+ }++ private UserManager getUserManager() {+ return OneDev.getInstance(UserManager.class);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ if (getLoginUser().getSsoInfo().getConnector() != null) {+ add(new Label("content", "You are currently authenticated via SSO provider '"+ + getLoginUser().getSsoInfo().getConnector() + "', "+ + "and two-factor authentication should be configured there")+ .add(AttributeAppender.append("class", "alert alert-light-warning alert-notice mb-0")));+ } else if (getLoginUser().getTwoFactorAuthentication() != null) {+ Fragment fragment = new Fragment("content", "enabledFrag", this);+ fragment.add(new Label("message", new AbstractReadOnlyModel<String>() {++ @Override+ public String getObject() {+ if (getLoginUser().isEnforce2FA() && !SecurityUtils.isAdministrator()) {+ return "Two-factor authentication is enforced for your account, "+ + "and can only be disabled by administrator";+ } else {+ return "Two-factor authentication is enabled for your account";+ }+ }++ }));+ fragment.add(new AjaxLink<Void>("disable") {++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ attributes.getAjaxCallListeners().add(new ConfirmClickListener(+ "Do you really want to disable two-factor authentication?"));+ }++ @Override+ public void onClick(AjaxRequestTarget target) {+ getLoginUser().setTwoFactorAuthentication(null);+ getUserManager().save(getLoginUser());+ Session.get().success("Two-factor authentication disabled");+ setResponsePage(MyTwoFactorAuthenticationPage.class);+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(SecurityUtils.isAdministrator() || !getLoginUser().isEnforce2FA());+ }++ });+ add(fragment);+ } else {+ Fragment fragment = new Fragment("content", "disabledFrag", this);+ fragment.add(new ModalLink("enable") {++ @Override+ protected Component newContent(String id, ModalPanel modal) {+ return new TwoFactorAuthenticationSetupPanel(id) {++ @Override+ protected void onEnabled(AjaxRequestTarget target) {+ modal.close();+ setResponsePage(MyTwoFactorAuthenticationPage.class);+ }++ @Override+ protected void onCancelled(AjaxRequestTarget target) {+ modal.close();+ }++ @Override+ protected User getUser() {+ return getLoginUser();+ }++ };+ }++ });+ add(fragment);+ }+ }++ @Override+ protected Component newTopbarTitle(String componentId) {+ return new Label(componentId, "Two Factor Authentication");+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/page/simple/SimplePage.java b/server-core/src/main/java/io/onedev/server/web/page/simple/SimplePage.javaindex 2cc175f198..74c09c7a9c 100644--- a/server-core/src/main/java/io/onedev/server/web/page/simple/SimplePage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/simple/SimplePage.java@@ -6,6 +6,7 @@ import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.web.component.svg.SpriteImage;@@ -22,11 +23,24 @@ public abstract class SimplePage extends BasePage {protected void onInitialize() {super.onInitialize();add(new SpriteImage("logo", getLogoHref()));- add(new Label("title", getTitle()));+ add(new Label("title", new AbstractReadOnlyModel<String>() {++ @Override+ public String getObject() {+ return getTitle();+ }++ }));+ }++ @Override+ protected void onBeforeRender() {+ super.onBeforeRender();+if (getSubTitle() != null)- add(new Label("subTitle", getSubTitle()));+ addOrReplace(new Label("subTitle", getSubTitle()));else- add(new WebMarkupContainer("subTitle").setVisible(false));+ addOrReplace(new WebMarkupContainer("subTitle").setVisible(false));}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/simple/security/LoginPage.html b/server-core/src/main/java/io/onedev/server/web/page/simple/security/LoginPage.htmlindex 1b09f71a3e..10c922b2c0 100644--- a/server-core/src/main/java/io/onedev/server/web/page/simple/security/LoginPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/simple/security/LoginPage.html@@ -1,31 +1,55 @@<wicket:extend>- <form wicket:id="form" method="post">- <div wicket:id="feedback"></div>- <div class="form-group">- <input wicket:id="userName" autocomplete="username" type="text" class="form-control" placeholder="Login name or email address">- </div>- <div class="form-group">- <input wicket:id="password" autocomplete="current-password" type="password" class="form-control" placeholder="Password">- </div>- <div class="form-group d-flex flex-wrap justify-content-between">- <div class="checkbox-inline">- <label class="checkbox text-muted">- <input wicket:id="rememberMe" id="rememberMe" type="checkbox" class="form-check-input">- Remember Me- </label>+ <div wicket:id="content"></div>+ <wicket:fragment wicket:id="passwordCheckFrag">+ <form wicket:id="form" method="post">+ <div wicket:id="feedback"></div>+ <div class="form-group">+ <input wicket:id="userName" autocomplete="username" type="text" class="form-control" placeholder="Login name or email address">+ </div>+ <div class="form-group">+ <input wicket:id="password" autocomplete="current-password" type="password" class="form-control" placeholder="Password">+ </div>+ <div class="form-group d-flex flex-wrap justify-content-between">+ <div class="checkbox-inline">+ <label class="checkbox text-muted">+ <input wicket:id="rememberMe" id="rememberMe" type="checkbox" class="form-check-input">+ Remember Me+ </label>+ </div>+ <a wicket:id="forgetPassword" class="text-muted text-hover-primary">Forgot Password?</a></div>- <a wicket:id="forgetPassword" class="text-muted text-hover-primary">Forgot Password?</a>+ <button class="btn btn-primary font-weight-bold" type="submit">Sign in</button>+ </form>+ <wicket:enclosure child="registerUser">+ <div class="signup">+ <span class="opacity-50 mr-3">Don't have an account yet?</span> <a wicket:id="registerUser" class="text-muted text-hover-primary font-weight-bold">Sign Up!</a>+ </div>+ </wicket:enclosure>+ <wicket:enclosure child="ssoButtons">+ <div class="sso">+ <a wicket:id="ssoButtons" class="btn btn-light btn-block mb-3"><img wicket:id="image" class="mr-3"> <span wicket:id="label"></span></a></div>- <button class="btn btn-primary font-weight-bold" type="submit">Sign in</button>- </form>- <wicket:enclosure child="registerUser">- <div class="signup">- <span class="opacity-50 mr-3">Don't have an account yet?</span> <a wicket:id="registerUser" class="text-muted text-hover-primary font-weight-bold">Sign Up!</a>+ </wicket:enclosure>+ </wicket:fragment>+ <wicket:fragment wicket:id="passcodeVerifyFrag">+ <form wicket:id="form" method="post">+ <div wicket:id="feedback"></div>+ <div class="form-group">+ <input wicket:id="passcode" type="text" class="form-control" placeholder="6-digits passcode">+ </div>+ <button class="btn btn-primary font-weight-bold" type="submit">Verify</button>+ </form>+ <div class="mt-5 font-size-sm text-muted">+ <a wicket:id="verifyRecoveryCode">Verify by recovery code</a> if you can not access your TOTP authenticator</div>- </wicket:enclosure>- <wicket:enclosure child="ssoButtons">- <div class="sso">- <a wicket:id="ssoButtons" class="btn btn-light btn-block mb-3"><img wicket:id="image" class="mr-3"> <span wicket:id="label"></span></a>- </div>- </wicket:enclosure>+ </wicket:fragment>+ <wicket:fragment wicket:id="recoveryCodeVerifyFrag">+ <form wicket:id="form" method="post">+ <div wicket:id="feedback"></div>+ <div class="form-group">+ <input wicket:id="recoveryCode" type="text" placeholder="Recovery code" class="form-control">+ </div>+ <button class="btn btn-primary font-weight-bold" type="submit">Verify</button>+ </form>+ </wicket:fragment></wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/simple/security/LoginPage.java b/server-core/src/main/java/io/onedev/server/web/page/simple/security/LoginPage.javaindex b31481bd7f..4b401f82b1 100644--- a/server-core/src/main/java/io/onedev/server/web/page/simple/security/LoginPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/simple/security/LoginPage.java@@ -4,31 +4,42 @@ import static io.onedev.server.web.page.admin.sso.SsoProcessPage.MOUNT_PATH;import static io.onedev.server.web.page.admin.sso.SsoProcessPage.STAGE_INITIATE;import org.apache.shiro.authc.AuthenticationException;+import org.apache.shiro.authc.AuthenticationToken;import org.apache.shiro.authc.IncorrectCredentialsException;import org.apache.shiro.authc.UnknownAccountException;import org.apache.shiro.authc.UsernamePasswordToken;+import org.apache.shiro.mgt.RememberMeManager;+import org.apache.shiro.subject.PrincipalCollection;import org.apache.wicket.RestartResponseException;+import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.feedback.FencedFeedbackPanel;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.form.CheckBox;+import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.form.PasswordTextField;-import org.apache.wicket.markup.html.form.StatelessForm;import org.apache.wicket.markup.html.form.TextField;import org.apache.wicket.markup.html.image.ExternalImage;import org.apache.wicket.markup.html.link.ExternalLink;+import org.apache.wicket.markup.html.link.Link;+import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.repeater.RepeatingView;import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.apache.wicket.request.mapper.parameter.PageParameters;+import com.google.common.base.Preconditions;+import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.entitymanager.UserManager;+import io.onedev.server.model.User;import io.onedev.server.model.support.administration.sso.SsoConnector;import io.onedev.server.security.SecurityUtils;-import io.onedev.server.web.WebSession;+import io.onedev.server.security.realm.PasswordAuthorizingRealm;import io.onedev.server.web.component.link.ViewStateAwarePageLink;+import io.onedev.server.web.component.twofactorauthentication.TwoFactorAuthenticationSetupPanel;import io.onedev.server.web.page.simple.SimpleCssResourceReference;import io.onedev.server.web.page.simple.SimplePage;@@ -38,11 +49,17 @@ public class LoginPage extends SimplePage {private String userName;private String password;++ private String passcode;++ private String recoveryCode;private boolean rememberMe;private String errorMessage;+ private String subTitle = "Enter your details to login to your account";+public LoginPage(PageParameters params) {super(params);@@ -55,19 +72,36 @@ public class LoginPage extends SimplePage {this.errorMessage = errorMessage;}++@Overrideprotected void onInitialize() {super.onInitialize();- StatelessForm<?> form = new StatelessForm<Void>("form") {+ Fragment fragment = new Fragment("content", "passwordCheckFrag", this);++ Form<?> form = new Form<Void>("form") {@Overrideprotected void onSubmit() {super.onSubmit();try {- WebSession.get().login(new UsernamePasswordToken(userName, password, rememberMe));- continueToOriginalDestination();- setResponsePage(getApplication().getHomePage());+ AuthenticationToken token = new UsernamePasswordToken(userName, password, rememberMe);++ PrincipalCollection principals = OneDev.getInstance(PasswordAuthorizingRealm.class)+ .getAuthenticationInfo(token).getPrincipals();+ User user = Preconditions.checkNotNull(SecurityUtils.toUser(principals));+ if (user.getTwoFactorAuthentication() != null) {+ subTitle = "Two-factor authentication is enabled. Please input passcode displayed on your TOTP authenticator. "+ + "If you encounter problems, make sure time of OneDev server and your device running TOTP "+ + "authenticator is in sync";+ newPasscodeVerifyFrag(user.getId());+ } else if (user.isEnforce2FA()) {+ subTitle = "Set up two-factor authentication";+ newTwoFactorAuthenticationSetup(user.getId());+ } else {+ afterLogin(user);+ }} catch (IncorrectCredentialsException e) {error("Incorrect credentials");} catch (UnknownAccountException e) {@@ -147,13 +181,13 @@ public class LoginPage extends SimplePage {}});-- add(form);++ fragment.add(form);SettingManager settingManager = OneDev.getInstance(SettingManager.class);boolean enableSelfRegister = settingManager.getSecuritySetting().isEnableSelfRegister();- add(new ViewStateAwarePageLink<Void>("registerUser", SignUpPage.class).setVisible(enableSelfRegister));+ fragment.add(new ViewStateAwarePageLink<Void>("registerUser", SignUpPage.class).setVisible(enableSelfRegister));String serverUrl = settingManager.getSystemSetting().getServerUrl();@@ -165,9 +199,134 @@ public class LoginPage extends SimplePage {ssoButton.add(new Label("label", "Login with " + connector.getName()));ssoButtonsView.add(ssoButton);}- add(ssoButtonsView.setVisible(!settingManager.getSsoConnectors().isEmpty()));+ fragment.add(ssoButtonsView.setVisible(!settingManager.getSsoConnectors().isEmpty()));++ add(fragment);+ }++ private UserManager getUserManager() {+ return OneDev.getInstance(UserManager.class);}+ private void afterLogin(User user) {+ SecurityUtils.getSubject().runAs(user.getPrincipals());+ RememberMeManager rememberMeManager = OneDev.getInstance(RememberMeManager.class);+ AuthenticationToken token = new UsernamePasswordToken(userName, password, rememberMe);+ rememberMeManager.onSuccessfulLogin(SecurityUtils.getSubject(), token, user);++ continueToOriginalDestination();+ setResponsePage(getApplication().getHomePage());+ }++ private void newTwoFactorAuthenticationSetup(Long userId) {+ replace(new TwoFactorAuthenticationSetupPanel("content") {++ @Override+ protected void onEnabled(AjaxRequestTarget target) {+ afterLogin(getUser());+ }++ @Override+ protected void onCancelled(AjaxRequestTarget target) {+ setResponsePage(LoginPage.class);+ }++ @Override+ protected User getUser() {+ return getUserManager().load(userId);+ }++ });+ }++ private void newPasscodeVerifyFrag(Long userId) {+ Fragment fragment = new Fragment("content", "passcodeVerifyFrag", this);+ Form<?> form = new Form<Void>("form") {++ @Override+ protected void onSubmit() {+ super.onSubmit();+ User user = getUserManager().load(userId);+ if (user.getTwoFactorAuthentication().getTOTPCode().equals(passcode))+ afterLogin(user);+ else+ error("Passcode verification failed");+ }++ };+ form.add(new FencedFeedbackPanel("feedback", form));+ form.add(new TextField<String>("passcode", new IModel<String>() {++ @Override+ public void detach() {+ }++ @Override+ public String getObject() {+ return passcode;+ }++ @Override+ public void setObject(String object) {+ LoginPage.this.passcode = object;+ }++ }).setLabel(Model.of("Passcode")).setRequired(true));++ fragment.add(form);+ fragment.add(new Link<Void>("verifyRecoveryCode") {++ @Override+ public void onClick() {+ subTitle = "Please input one of your recovery codes saved when enable two-factor authentication";+ newRecoveryCodeVerifyFrag(userId);+ }++ });++ replace(fragment);+ }++ private void newRecoveryCodeVerifyFrag(Long userId) {+ Fragment fragment = new Fragment("content", "recoveryCodeVerifyFrag", this);+ Form<?> form = new Form<Void>("form") {++ @Override+ protected void onSubmit() {+ super.onSubmit();+ User user = getUserManager().load(userId);+ if (user.getTwoFactorAuthentication().getScratchCodes().remove(recoveryCode)) {+ getUserManager().save(user);+ afterLogin(user);+ } else {+ error("Recovery code verification failed");+ }+ }++ };+ form.add(new FencedFeedbackPanel("feedback", form));+ form.add(new TextField<String>("recoveryCode", new IModel<String>() {++ @Override+ public void detach() {+ }++ @Override+ public String getObject() {+ return recoveryCode;+ }++ @Override+ public void setObject(String object) {+ LoginPage.this.recoveryCode = object;+ }++ }).setLabel(Model.of("Recovery code")).setRequired(true));++ fragment.add(form);+ replace(fragment);+ }+@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);@@ -181,7 +340,7 @@ public class LoginPage extends SimplePage {@Overrideprotected String getSubTitle() {- return "Enter your details to login to your account";+ return subTitle;}}diff --git a/server-core/src/main/java/io/onedev/server/web/page/simple/simple.css b/server-core/src/main/java/io/onedev/server/web/page/simple/simple.cssindex 8516e3f0df..ccb575b617 100644--- a/server-core/src/main/java/io/onedev/server/web/page/simple/simple.css+++ b/server-core/src/main/java/io/onedev/server/web/page/simple/simple.css@@ -15,7 +15,7 @@margin: auto;}.SimplePage:not(.force-ordinary-style) .main {- width: 450px;+ width: 480px;}.SimplePage.GeneralErrorPage .main {width: 900px;@@ -97,3 +97,14 @@.PageNotFoundErrorPage .sub-title {font-size: 1.5rem !important;}++.LoginPage .setup-2fa {+ text-align: left;+}+.LoginPage .setup-2fa .modal-header {+ display: none;+}+.LoginPage .setup-2fa .modal-footer {+ border-top: none;+ justify-content: center;+}