Skip to content

The Unified and Autonomous Development Platform

Generate user token to integrate with 3rd-party applications

Robin Shen3dd417e4a9e9
diff --git a/core/src/main/java/com/gitplex/server/security/BasicAuthenticationFilter.java b/core/src/main/java/com/gitplex/server/security/BasicAuthenticationFilter.java
index c108b3740f..ac6bfc52fe 100644
--- a/core/src/main/java/com/gitplex/server/security/BasicAuthenticationFilter.java
+++ b/core/src/main/java/com/gitplex/server/security/BasicAuthenticationFilter.java
@@ -53,9 +53,8 @@ public class BasicAuthenticationFilter extends PathMatchingFilter {
HttpServletRequest httpRequest = WebUtils.toHttp(request);
String authzHeader = httpRequest.getHeader(AUTHORIZATION_HEADER);
if (authzHeader != null) {
- String authzScheme = HttpServletRequest.BASIC_AUTH.toLowerCase(Locale.ENGLISH);
-
- if (authzHeader.toLowerCase(Locale.ENGLISH).startsWith(authzScheme)) {
+ if (authzHeader.toLowerCase(Locale.ENGLISH).startsWith("basic")
+ || authzHeader.toLowerCase(Locale.ENGLISH).startsWith("token")) {
String authToken = StringUtils.substringAfter(authzHeader, " ");
String decoded = Base64.decodeToString(authToken);
String userName = StringUtils.substringBefore(decoded, ":").trim();
diff --git a/web/src/main/java/com/gitplex/server/web/GitPlexUrlMapper.java b/web/src/main/java/com/gitplex/server/web/GitPlexUrlMapper.java
index 1c21839603..bdb3478199 100644
--- a/web/src/main/java/com/gitplex/server/web/GitPlexUrlMapper.java
+++ b/web/src/main/java/com/gitplex/server/web/GitPlexUrlMapper.java
@@ -51,6 +51,7 @@ import com.gitplex.server.web.page.user.AvatarEditPage;
import com.gitplex.server.web.page.user.NewUserPage;
import com.gitplex.server.web.page.user.PasswordEditPage;
import com.gitplex.server.web.page.user.TaskListPage;
+import com.gitplex.server.web.page.user.TokenGeneratePage;
import com.gitplex.server.web.page.user.UserAuthorizationsPage;
import com.gitplex.server.web.page.user.UserListPage;
import com.gitplex.server.web.page.user.UserMembershipsPage;
@@ -110,6 +111,7 @@ public class GitPlexUrlMapper extends CompoundRequestMapper {
add(new WebPageMapper("users/${user}/tasks", TaskListPage.class));
add(new WebPageMapper("users/${user}/avatar", AvatarEditPage.class));
add(new WebPageMapper("users/${user}/password", PasswordEditPage.class));
+ add(new WebPageMapper("users/${user}/token", TokenGeneratePage.class));
}
private void addGroupPages() {
diff --git a/web/src/main/java/com/gitplex/server/web/page/test/TestPage.java b/web/src/main/java/com/gitplex/server/web/page/test/TestPage.java
index f94bb06738..63fea58a20 100644
--- a/web/src/main/java/com/gitplex/server/web/page/test/TestPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/test/TestPage.java
@@ -1,7 +1,9 @@
package com.gitplex.server.web.page.test;
+import org.apache.shiro.authc.UsernamePasswordToken;
import org.apache.wicket.markup.html.link.Link;
+import com.gitplex.server.security.SecurityUtils;
import com.gitplex.server.web.page.base.BasePage;
@SuppressWarnings("serial")
@@ -15,6 +17,7 @@ public class TestPage extends BasePage {
@Override
public void onClick() {
+ System.out.println(SecurityUtils.getSecurityManager().authenticate(new UsernamePasswordToken("robinshine", "sysvalue8")));
}
});
diff --git a/web/src/main/java/com/gitplex/server/web/page/user/OldPassword.java b/web/src/main/java/com/gitplex/server/web/page/user/CurrentPassword.java
similarity index 88%
rename from web/src/main/java/com/gitplex/server/web/page/user/OldPassword.java
rename to web/src/main/java/com/gitplex/server/web/page/user/CurrentPassword.java
index 116afa34cc..f01d97ae0b 100644
--- a/web/src/main/java/com/gitplex/server/web/page/user/OldPassword.java
+++ b/web/src/main/java/com/gitplex/server/web/page/user/CurrentPassword.java
@@ -20,8 +20,8 @@ import javax.validation.Payload;
*/
@Target({ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
-@Constraint(validatedBy=OldPasswordValidator.class)
-@interface OldPassword {
+@Constraint(validatedBy=CurrentPasswordValidator.class)
+@interface CurrentPassword {
String message() default "Old password does not match";
diff --git a/web/src/main/java/com/gitplex/server/web/page/user/CurrentPasswordValidator.java b/web/src/main/java/com/gitplex/server/web/page/user/CurrentPasswordValidator.java
new file mode 100644
index 0000000000..2d580e5405
--- /dev/null
+++ b/web/src/main/java/com/gitplex/server/web/page/user/CurrentPasswordValidator.java
@@ -0,0 +1,34 @@
+package com.gitplex.server.web.page.user;
+
+import javax.validation.ConstraintValidator;
+import javax.validation.ConstraintValidatorContext;
+
+import org.apache.shiro.authc.AuthenticationToken;
+import org.apache.shiro.authc.UsernamePasswordToken;
+
+import com.gitplex.server.security.SecurityUtils;
+import com.gitplex.server.web.util.WicketUtils;
+
+public class CurrentPasswordValidator implements ConstraintValidator<CurrentPassword, String> {
+
+ public void initialize(CurrentPassword constaintAnnotation) {
+ }
+
+ public boolean isValid(String value, ConstraintValidatorContext constraintContext) {
+ if (value != null) {
+ UserPage page = (UserPage) WicketUtils.getPage();
+
+ AuthenticationToken token = new UsernamePasswordToken(page.getUser().getName(), value);
+ try {
+ if (SecurityUtils.getSecurityManager().authenticate(token) != null)
+ return true;
+ } catch (Exception e) {
+ }
+ constraintContext.disableDefaultConstraintViolation();
+ constraintContext.buildConstraintViolationWithTemplate("Current password does not match").addConstraintViolation();
+ return false;
+ } else {
+ return true;
+ }
+ }
+}
diff --git a/web/src/main/java/com/gitplex/server/web/page/user/OldPasswordValidator.java b/web/src/main/java/com/gitplex/server/web/page/user/OldPasswordValidator.java
deleted file mode 100644
index cf9c9398eb..0000000000
--- a/web/src/main/java/com/gitplex/server/web/page/user/OldPasswordValidator.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.gitplex.server.web.page.user;
-
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
-
-import org.apache.shiro.authc.credential.PasswordService;
-
-import com.gitplex.launcher.loader.AppLoader;
-import com.gitplex.server.web.util.WicketUtils;
-
-public class OldPasswordValidator implements ConstraintValidator<OldPassword, String> {
-
- public void initialize(OldPassword constaintAnnotation) {
- }
-
- public boolean isValid(String value, ConstraintValidatorContext constraintContext) {
- if (value != null) {
- UserPage page = (UserPage) WicketUtils.getPage();
- PasswordService passwordService = AppLoader.getInstance(PasswordService.class);
- if (!passwordService.passwordsMatch(value, (String) page.getUser().getPassword())) {
- constraintContext.disableDefaultConstraintViolation();
- constraintContext.buildConstraintViolationWithTemplate("Old password does not match").addConstraintViolation();
- return false;
- } else {
- return true;
- }
- } else {
- return true;
- }
- }
-}
diff --git a/web/src/main/java/com/gitplex/server/web/page/user/PasswordEditBean.java b/web/src/main/java/com/gitplex/server/web/page/user/PasswordEditBean.java
index 1d2c078ec4..c38d12c207 100644
--- a/web/src/main/java/com/gitplex/server/web/page/user/PasswordEditBean.java
+++ b/web/src/main/java/com/gitplex/server/web/page/user/PasswordEditBean.java
@@ -17,7 +17,7 @@ public class PasswordEditBean implements Serializable {
private String newPassword;
@Editable(order=100)
- @OldPassword
+ @CurrentPassword
@Password
@NotEmpty
public String getOldPassword() {
diff --git a/web/src/main/java/com/gitplex/server/web/page/user/TokenGenerateBean.java b/web/src/main/java/com/gitplex/server/web/page/user/TokenGenerateBean.java
new file mode 100644
index 0000000000..71382bbb5e
--- /dev/null
+++ b/web/src/main/java/com/gitplex/server/web/page/user/TokenGenerateBean.java
@@ -0,0 +1,29 @@
+package com.gitplex.server.web.page.user;
+
+import java.io.Serializable;
+
+import org.hibernate.validator.constraints.NotEmpty;
+
+import com.gitplex.server.util.editable.annotation.Editable;
+import com.gitplex.server.util.editable.annotation.Password;
+
+@Editable
+public class TokenGenerateBean implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ private String password;
+
+ @Editable(order=100, description="Input password of this user")
+ @CurrentPassword
+ @Password
+ @NotEmpty
+ public String getPassword() {
+ return password;
+ }
+
+ public void setPassword(String password) {
+ this.password = password;
+ }
+
+}
diff --git a/web/src/main/java/com/gitplex/server/web/page/user/TokenGeneratePage.html b/web/src/main/java/com/gitplex/server/web/page/user/TokenGeneratePage.html
new file mode 100644
index 0000000000..005576f6d0
--- /dev/null
+++ b/web/src/main/java/com/gitplex/server/web/page/user/TokenGeneratePage.html
@@ -0,0 +1,19 @@
+<wicket:extend>
+ <div class="token-generate">
+ <div class="body">
+ <div class="alert alert-info">Access token can be used to provide access to GitPlex in some third-party
+ applications not supporting http basic authentication</div>
+ <form wicket:id="form" class="leave-confirm" autocomplete="off">
+ <div wicket:id="editor"></div>
+ <div class="actions">
+ <input type="submit" class="btn btn-primary dirty-aware" value="Display"></input>
+ </div>
+ </form>
+ <wicket:enclosure child="token">
+ <div class="token-value">
+ <b>Access Token:</b> <span wicket:id="token"></span> <a wicket:id="copy"><i class="fa fa-clipboard"></i></a>
+ </div>
+ </wicket:enclosure>
+ </div>
+ </div>
+</wicket:extend>
\ No newline at end of file
diff --git a/web/src/main/java/com/gitplex/server/web/page/user/TokenGeneratePage.java b/web/src/main/java/com/gitplex/server/web/page/user/TokenGeneratePage.java
new file mode 100644
index 0000000000..a1bb2d75c7
--- /dev/null
+++ b/web/src/main/java/com/gitplex/server/web/page/user/TokenGeneratePage.java
@@ -0,0 +1,79 @@
+package com.gitplex.server.web.page.user;
+
+import org.apache.shiro.codec.Base64;
+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.model.AbstractReadOnlyModel;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
+import com.gitplex.server.security.SecurityUtils;
+import com.gitplex.server.web.behavior.clipboard.CopyClipboardBehavior;
+import com.gitplex.server.web.editable.BeanContext;
+
+import jersey.repackaged.com.google.common.collect.Sets;
+
+@SuppressWarnings("serial")
+public class TokenGeneratePage extends UserPage {
+
+ private String token;
+
+ public TokenGeneratePage(PageParameters params) {
+ super(params);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ TokenGenerateBean bean = new TokenGenerateBean();
+
+ Form<?> form = new Form<Void>("form") {
+
+ @Override
+ protected void onSubmit() {
+ super.onSubmit();
+
+ token = new String(Base64.encode((getUser().getName() + ":" + bean.getPassword()).getBytes()));
+
+ bean.setPassword(null);
+ replace(BeanContext.editBean("editor", bean, Sets.newHashSet()));
+ }
+
+ };
+ add(form);
+
+ form.add(BeanContext.editBean("editor", bean, Sets.newHashSet()));
+
+ add(new Label("token", new AbstractReadOnlyModel<String>() {
+
+ @Override
+ public String getObject() {
+ return token;
+ }
+
+ }) {
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(token != null);
+ }
+
+ });
+ add(new WebMarkupContainer("copy").add(new CopyClipboardBehavior(new AbstractReadOnlyModel<String>() {
+
+ @Override
+ public String getObject() {
+ return token;
+ }
+
+ })));
+ }
+
+ @Override
+ protected boolean isPermitted() {
+ return SecurityUtils.canManage(getUser());
+ }
+
+}
diff --git a/web/src/main/java/com/gitplex/server/web/page/user/UserPage.java b/web/src/main/java/com/gitplex/server/web/page/user/UserPage.java
index e183c99a78..306eba3575 100644
--- a/web/src/main/java/com/gitplex/server/web/page/user/UserPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/user/UserPage.java
@@ -16,6 +16,7 @@ import com.gitplex.server.GitPlex;
import com.gitplex.server.manager.UserManager;
import com.gitplex.server.model.User;
import com.gitplex.server.security.SecurityUtils;
+import com.gitplex.server.util.StringUtils;
import com.gitplex.server.web.ComponentRenderer;
import com.gitplex.server.web.component.avatar.Avatar;
import com.gitplex.server.web.component.link.ViewStateAwarePageLink;
@@ -64,7 +65,10 @@ public abstract class UserPage extends LayoutPage {
tabs.add(new UserTab("Profile", "fa fa-fw fa-list-alt", UserProfilePage.class));
if (SecurityUtils.canManage(getUser())) {
tabs.add(new UserTab("Edit Avatar", "fa fa-fw fa-picture-o", AvatarEditPage.class));
- tabs.add(new UserTab("Change Password", "fa fa-fw fa-key", PasswordEditPage.class));
+
+ if (StringUtils.isNotBlank(getUser().getPassword()))
+ tabs.add(new UserTab("Change Password", "fa fa-fw fa-key", PasswordEditPage.class));
+ tabs.add(new UserTab("Access Token", "fa fa-fw fa-key", TokenGeneratePage.class));
}
tabs.add(new UserTab("Groups", "fa fa-fw fa-group", UserMembershipsPage.class));
if (SecurityUtils.isAdministrator())
diff --git a/web/src/main/java/com/gitplex/server/web/page/user/user.css b/web/src/main/java/com/gitplex/server/web/page/user/user.css
index 18b93daa11..4b4a4ec3ad 100644
--- a/web/src/main/java/com/gitplex/server/web/page/user/user.css
+++ b/web/src/main/java/com/gitplex/server/web/page/user/user.css
@@ -39,3 +39,11 @@
.new-user .actions .btn {
margin-right: 20px;
}
+
+.token-generate .token-value {
+ margin-top: 20px;
+}
+.token-generate .token-value a {
+ color: #444;
+ margin-left: 4px;
+}
\ No newline at end of file