Skip to content

The Unified and Autonomous Development Platform

Some bug fixes relating to database schema and OIDC integration

Robin Shenb2f27895c44b
diff --git a/server-core/src/main/java/io/onedev/server/model/Project.java b/server-core/src/main/java/io/onedev/server/model/Project.java
index 4ffb731d76..1fd2bddbbe 100644
--- a/server-core/src/main/java/io/onedev/server/model/Project.java
+++ b/server-core/src/main/java/io/onedev/server/model/Project.java
@@ -256,7 +256,6 @@ public class Project extends AbstractEntity {
@OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)
private Collection<Milestone> milestones = new ArrayList<>();
- @Column
private boolean issueManagementEnabled = true;
@Lob
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.java
index 282953fbee..15a2aa7a59 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
@@ -113,7 +113,7 @@ public class User extends AbstractEntity implements AuthenticationInfo {
private String fullName;
@Embedded
- private SsoInfo ssoInfo;
+ private SsoInfo ssoInfo = new SsoInfo();
@Column(unique=true, nullable=false)
private String email;
@@ -571,7 +571,7 @@ public class User extends AbstractEntity implements AuthenticationInfo {
public boolean isSshKeyExternalManaged() {
if (isExternalManaged()) {
- if (getSsoInfo() != null) {
+ if (getSsoInfo().getConnector() != null) {
return false;
} else {
Authenticator authenticator = OneDev.getInstance(SettingManager.class).getAuthenticator();
@@ -585,7 +585,7 @@ public class User extends AbstractEntity implements AuthenticationInfo {
public boolean isMembershipExternalManaged() {
if (isExternalManaged()) {
SettingManager settingManager = OneDev.getInstance(SettingManager.class);
- if (getSsoInfo() != null) {
+ if (getSsoInfo().getConnector() != null) {
SsoConnector ssoConnector = settingManager.getSsoConnectors().stream()
.filter(it->it.getName().equals(getSsoInfo().getConnector()))
.findFirst().orElse(null);
@@ -601,7 +601,7 @@ public class User extends AbstractEntity implements AuthenticationInfo {
public String getAuthSource() {
if (isExternalManaged()) {
- if (getSsoInfo() != null)
+ if (getSsoInfo().getConnector() != null)
return AUTH_SOURCE_SSO_PROVIDER + getSsoInfo().getConnector();
else
return AUTH_SOURCE_EXTERNAL_AUTHENTICATOR;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/SsoInfo.java b/server-core/src/main/java/io/onedev/server/model/support/SsoInfo.java
index 3ce3017f28..4de66586f5 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/SsoInfo.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/SsoInfo.java
@@ -1,7 +1,9 @@
package io.onedev.server.model.support;
import java.io.Serializable;
+import java.util.UUID;
+import javax.annotation.Nullable;
import javax.persistence.Column;
import javax.persistence.Embeddable;
@@ -21,9 +23,15 @@ public class SsoInfo implements Serializable {
@Column(name=COLUMN_CONNECTOR)
private String connector;
- @Column(name=COLUMN_SUBJECT)
- private String subject;
-
+ /*
+ * SQL Server treats null as a value when checking unique constraints. So we
+ * need to populate subject even if no SSO is used to avoid violating unique
+ * constraint on connector and subject combo
+ */
+ @Column(name=COLUMN_SUBJECT, nullable=false)
+ private String subject = UUID.randomUUID().toString();
+
+ @Nullable
public String getConnector() {
return connector;
}
diff --git a/server-core/src/main/java/io/onedev/server/security/realm/PasswordAuthorizingRealm.java b/server-core/src/main/java/io/onedev/server/security/realm/PasswordAuthorizingRealm.java
index 8c97d5cbd7..f3be1fa8d5 100644
--- a/server-core/src/main/java/io/onedev/server/security/realm/PasswordAuthorizingRealm.java
+++ b/server-core/src/main/java/io/onedev/server/security/realm/PasswordAuthorizingRealm.java
@@ -122,7 +122,7 @@ public class PasswordAuthorizingRealm extends AbstractAuthorizingRealm {
user = newUser(userName, authenticated, authenticator.getDefaultGroup());
}
} else if (user.getPassword().equals(User.EXTERNAL_MANAGED)) {
- if (user.getSsoInfo() != null) {
+ if (user.getSsoInfo().getConnector() != null) {
throw new AuthenticationException("Account '" + userName
+ "' is set to authenticate via " + User.AUTH_SOURCE_SSO_PROVIDER
+ user.getSsoInfo().getConnector());
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/password/UserPasswordPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/password/UserPasswordPage.java
index 1ca005ad64..d72d056161 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/password/UserPasswordPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/password/UserPasswordPage.java
@@ -21,10 +21,14 @@ public class UserPasswordPage extends UserPage {
if (getUser().getPassword().equals(User.EXTERNAL_MANAGED)) {
String message;
- if (getUser().getSsoInfo() != null)
- message = "The user is currently authenticated via SSO provider '" + getUser().getSsoInfo().getConnector() + "', please change password there instead";
- else
- message = "The user is currently authenticated via external system, please change password there instead";
+ if (getUser().getSsoInfo().getConnector() != null) {
+ message = "The user is currently authenticated via SSO provider '"
+ + getUser().getSsoInfo().getConnector()
+ + "', please change password there instead";
+ } else {
+ message = "The user is currently authenticated via external system, "
+ + "please change password there instead";
+ }
add(new Label("content", message).add(AttributeAppender.append("class", "alert alert-warning")));
} else {
add(new PasswordEditPanel("content", userModel));
diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/password/MyPasswordPage.java b/server-core/src/main/java/io/onedev/server/web/page/my/password/MyPasswordPage.java
index d217f9c32e..d7be76892e 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/my/password/MyPasswordPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/my/password/MyPasswordPage.java
@@ -22,10 +22,14 @@ public class MyPasswordPage extends MyPage {
if (getLoginUser().getPassword().equals(User.EXTERNAL_MANAGED)) {
String message;
- if (getLoginUser().getSsoInfo() != null)
- message = "You are currently authenticated via SSO provider '" + getLoginUser().getSsoInfo().getConnector() + "', please change password there instead";
- else
- message = "You are currently authenticated via external system, please change password there instead";
+ if (getLoginUser().getSsoInfo().getConnector() != null) {
+ message = "You are currently authenticated via SSO provider '"
+ + getLoginUser().getSsoInfo().getConnector()
+ + "', please change password there instead";
+ } else {
+ message = "You are currently authenticated via external system, "
+ + "please change password there instead";
+ }
add(new Label("content", message).add(AttributeAppender.append("class", "alert alert-warning")));
} else {
add(new PasswordEditPanel("content", new AbstractReadOnlyModel<User>() {
diff --git a/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/OpenIdConnector.java b/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/OpenIdConnector.java
index 923e0e8c3e..d0710fa652 100644
--- a/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/OpenIdConnector.java
+++ b/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/OpenIdConnector.java
@@ -32,7 +32,6 @@ import com.nimbusds.oauth2.sdk.Scope;
import com.nimbusds.oauth2.sdk.SerializeException;
import com.nimbusds.oauth2.sdk.TokenErrorResponse;
import com.nimbusds.oauth2.sdk.TokenRequest;
-import com.nimbusds.oauth2.sdk.TokenResponse;
import com.nimbusds.oauth2.sdk.auth.ClientAuthentication;
import com.nimbusds.oauth2.sdk.auth.ClientSecretBasic;
import com.nimbusds.oauth2.sdk.auth.Secret;
@@ -47,7 +46,6 @@ import com.nimbusds.openid.connect.sdk.AuthenticationResponseParser;
import com.nimbusds.openid.connect.sdk.AuthenticationSuccessResponse;
import com.nimbusds.openid.connect.sdk.Nonce;
import com.nimbusds.openid.connect.sdk.OIDCAccessTokenResponse;
-import com.nimbusds.openid.connect.sdk.OIDCTokenResponseParser;
import com.nimbusds.openid.connect.sdk.UserInfoErrorResponse;
import com.nimbusds.openid.connect.sdk.UserInfoRequest;
@@ -190,9 +188,14 @@ public class OpenIdConnector extends SsoConnector {
TokenRequest tokenRequest = new TokenRequest(
new URI(getCachedProviderMetadata().getTokenEndpoint()), clientAuth, codeGrant);
HTTPResponse httpResponse = tokenRequest.toHTTPRequest().send();
- TokenResponse tokenResponse = OIDCTokenResponseParser.parse(httpResponse);
- if (tokenResponse instanceof TokenErrorResponse) {
- ErrorObject error = ((TokenErrorResponse) tokenResponse).getErrorObject();
+ if (httpResponse.getStatusCode() == HTTPResponse.SC_OK) {
+ JSONObject jsonObject = httpResponse.getContentAsJSONObject();
+ if (jsonObject.get("error") != null)
+ throw buildException(TokenErrorResponse.parse(jsonObject).getErrorObject());
+ else
+ return processTokenResponse(OIDCAccessTokenResponse.parse(jsonObject));
+ } else {
+ ErrorObject error = TokenErrorResponse.parse(httpResponse).getErrorObject();
if (error != null) {
throw buildException(error);
} else {
@@ -200,8 +203,6 @@ public class OpenIdConnector extends SsoConnector {
httpResponse.getStatusCode());
throw new AuthenticationException(message);
}
- } else {
- return processTokenResponse((OIDCAccessTokenResponse) tokenResponse);
}
}
} catch (ParseException | URISyntaxException|SerializeException|IOException e) {