Skip to content

The Unified and Autonomous Development Platform

Add OAuth support facility for project import

Robin Shen7bf3a791820d
diff --git a/server-core/src/main/java/io/onedev/server/util/validation/ProjectNameValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/ProjectNameValidator.java
index e36b7d291c..ac855e59cd 100644
--- a/server-core/src/main/java/io/onedev/server/util/validation/ProjectNameValidator.java
+++ b/server-core/src/main/java/io/onedev/server/util/validation/ProjectNameValidator.java
@@ -32,7 +32,7 @@ public class ProjectNameValidator implements ConstraintValidator<ProjectName, St
}
constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();
return false;
- } else if (value.equals("new")) {
+ } else if (value.equals("new") || value.equals("import")) {
constraintContext.disableDefaultConstraintViolation();
String message = this.message;
if (message.length() == 0)
diff --git a/server-core/src/main/java/io/onedev/server/web/OneUrlMapper.java b/server-core/src/main/java/io/onedev/server/web/OneUrlMapper.java
index 84e9e07117..6923468d16 100644
--- a/server-core/src/main/java/io/onedev/server/web/OneUrlMapper.java
+++ b/server-core/src/main/java/io/onedev/server/web/OneUrlMapper.java
@@ -73,6 +73,7 @@ import io.onedev.server.web.page.project.commits.CommitDetailPage;
import io.onedev.server.web.page.project.commits.ProjectCommitsPage;
import io.onedev.server.web.page.project.compare.RevisionComparePage;
import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;
+import io.onedev.server.web.page.project.imports.ProjectImportPage;
import io.onedev.server.web.page.project.issues.boards.IssueBoardsPage;
import io.onedev.server.web.page.project.issues.create.NewIssuePage;
import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;
@@ -227,6 +228,8 @@ public class OneUrlMapper extends CompoundRequestMapper {
private void addProjectPages() {
add(new DynamicPathPageMapper("projects", ProjectListPage.class));
add(new DynamicPathPageMapper("projects/new", NewProjectPage.class));
+ add(new DynamicPathPageMapper("projects/" + ProjectImportPage.MOUNT_PATH + "/${stage}/${importer}",
+ ProjectImportPage.class));
add(new DynamicPathPageMapper("projects/${project}", ProjectDashboardPage.class));
add(new DynamicPathPageMapper("projects/${project}/blob/#{revision}/#{path}", ProjectBlobPage.class));
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java
index 5aa17a6e4e..0484479e80 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java
@@ -1,6 +1,7 @@
package io.onedev.server.web.component.project.list;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.Iterator;
import java.util.List;
@@ -29,6 +30,7 @@ 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.link.BookmarkablePageLink;
+import org.apache.wicket.markup.html.link.ExternalLink;
import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.markup.repeater.Item;
@@ -40,6 +42,7 @@ import org.apache.wicket.request.cycle.RequestCycle;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.ProjectManager;
+import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.Project;
import io.onedev.server.search.entity.EntityCriteria;
import io.onedev.server.search.entity.EntitySort;
@@ -55,12 +58,17 @@ import io.onedev.server.web.component.datatable.OneDataTable;
import io.onedev.server.web.component.floating.FloatingPanel;
import io.onedev.server.web.component.link.ActionablePageLink;
import io.onedev.server.web.component.link.DropdownLink;
+import io.onedev.server.web.component.menu.MenuItem;
+import io.onedev.server.web.component.menu.MenuLink;
import io.onedev.server.web.component.orderedit.OrderEditPanel;
import io.onedev.server.web.component.project.avatar.ProjectAvatar;
import io.onedev.server.web.component.savedquery.SavedQueriesClosed;
import io.onedev.server.web.component.savedquery.SavedQueriesOpened;
import io.onedev.server.web.page.project.NewProjectPage;
import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;
+import io.onedev.server.web.page.project.imports.ProjectImportPage;
+import io.onedev.server.web.page.project.imports.ProjectImporter;
+import io.onedev.server.web.page.project.imports.ProjectImporterContribution;
import io.onedev.server.web.util.LoadableDetachableDataProvider;
import io.onedev.server.web.util.PagingHistorySupport;
import io.onedev.server.web.util.QuerySaveSupport;
@@ -269,7 +277,53 @@ public class ProjectListPanel extends Panel {
});
add(queryForm);
- add(new BookmarkablePageLink<Void>("addProject", NewProjectPage.class));
+ Collection<ProjectImporter> importers = new ArrayList<>();
+ for (ProjectImporterContribution contribution: OneDev.getExtensions(ProjectImporterContribution.class))
+ importers.addAll(contribution.getImporters());
+
+ if (importers.isEmpty()) {
+ add(new BookmarkablePageLink<Void>("addProject", NewProjectPage.class));
+ } else {
+ add(new MenuLink("addProject") {
+
+ @Override
+ protected List<MenuItem> getMenuItems(FloatingPanel dropdown) {
+ List<MenuItem> menuItems = new ArrayList<>();
+ menuItems.add(new MenuItem() {
+
+ @Override
+ public String getLabel() {
+ return "Create New";
+ }
+
+ @Override
+ public WebMarkupContainer newLink(String id) {
+ return new BookmarkablePageLink<Void>(id, NewProjectPage.class);
+ }
+
+ });
+ for (ProjectImporter importer: importers) {
+ menuItems.add(new MenuItem() {
+
+ @Override
+ public String getLabel() {
+ return "Import from " + importer.getName();
+ }
+
+ @Override
+ public WebMarkupContainer newLink(String id) {
+ String serverUrl = OneDev.getInstance(SettingManager.class).getSystemSetting().getServerUrl();
+ return new ExternalLink(id, Model.of(serverUrl + "/projects/" + ProjectImportPage.MOUNT_PATH + "/"
+ + ProjectImportPage.STAGE_INITIATE + "/" + importer.getName()));
+ }
+
+ });
+ }
+ return menuItems;
+ }
+
+ });
+ }
SortableDataProvider<Project, Void> dataProvider = new LoadableDetachableDataProvider<Project, Void>() {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/sso/SsoProcessPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/sso/SsoProcessPage.java
index aacda581b6..9b90c57c93 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/sso/SsoProcessPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/sso/SsoProcessPage.java
@@ -12,6 +12,7 @@ import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.flow.RedirectToUrlException;
import org.apache.wicket.request.mapper.parameter.PageParameters;
+import io.onedev.commons.utils.StringUtils;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.support.administration.sso.SsoAuthenticated;
@@ -64,7 +65,7 @@ public class SsoProcessPage extends BasePage {
if (stage.equals(STAGE_INITIATE)) {
String redirectUrlAfterLogin;
Url url = RestartResponseAtInterceptPageException.getOriginalUrl();
- if (url != null)
+ if (url != null && url.toString().length() != 0)
redirectUrlAfterLogin = url.toString();
else
redirectUrlAfterLogin = RequestCycle.get().urlFor(DashboardPage.class, new PageParameters()).toString();
@@ -75,7 +76,7 @@ public class SsoProcessPage extends BasePage {
SsoAuthenticated authenticated = connector.processLoginResponse();
String redirectUrlAfterLogin = (String) Session.get().getAttribute(SESSION_ATTR_REDIRECT_URL);
- if (redirectUrlAfterLogin == null)
+ if (StringUtils.isBlank(redirectUrlAfterLogin))
throw new AuthenticationException("unsolicited OIDC authentication response");
WebSession.get().login(authenticated);
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/imports/OAuthAwareImportPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/imports/OAuthAwareImportPanel.java
new file mode 100644
index 0000000000..020e543bb4
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/imports/OAuthAwareImportPanel.java
@@ -0,0 +1,95 @@
+package io.onedev.server.web.page.project.imports;
+
+import java.io.IOException;
+import java.util.UUID;
+import java.util.concurrent.ExecutionException;
+
+import org.apache.wicket.Session;
+import org.apache.wicket.request.flow.RedirectToUrlException;
+
+import com.github.scribejava.core.builder.ServiceBuilder;
+import com.github.scribejava.core.builder.api.DefaultApi20;
+import com.github.scribejava.core.model.OAuth2AccessToken;
+import com.github.scribejava.core.oauth.OAuth20Service;
+
+import io.onedev.commons.utils.ExplicitException;
+
+@SuppressWarnings("serial")
+public abstract class OAuthAwareImportPanel extends ProjectImportPanel {
+
+ public static final String STATE_PREFIX = "import-";
+
+ private static final String SESSION_ATTR_STATE = "state";
+
+ public OAuthAwareImportPanel(String id) {
+ super(id);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ if (!getImportPage().isCallbackStage()) {
+ String state = STATE_PREFIX + UUID.randomUUID().toString();
+ Session.get().setAttribute(SESSION_ATTR_STATE, state);
+
+ call(new OAuthServiceAwareCallable<String>() {
+
+ @Override
+ public String call(OAuth20Service service) {
+ throw new RedirectToUrlException(service.getAuthorizationUrl(state));
+ }
+
+ });
+
+ }
+
+ String state = (String) Session.get().getAttribute(SESSION_ATTR_STATE);
+ if (state == null || !state.equals(getAuthState()))
+ throw new ExplicitException("Unmatched OAuth state");
+
+ call(new OAuthServiceAwareCallable<Void>() {
+
+ @Override
+ public Void call(OAuth20Service service) {
+ try {
+ onInitialize(service, service.getAccessToken(getAuthCode()));
+ } catch (IOException | InterruptedException | ExecutionException e) {
+ throw new RuntimeException(e);
+ }
+ return null;
+ }
+
+ });
+ }
+
+ protected <T> T call(OAuthServiceAwareCallable<T> callable) {
+ try(OAuth20Service service = new ServiceBuilder(getApiKey())
+ .apiSecret(getApiSecret())
+ .callback(getCallbackUrl())
+ .build(getApiEndpoint())) {
+ return callable.call(service);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ private String getAuthState() {
+ return getPage().getPageParameters().get("state").toOptionalString();
+ }
+
+ private String getAuthCode() {
+ return getPage().getPageParameters().get("code").toOptionalString();
+ }
+
+ protected abstract DefaultApi20 getApiEndpoint();
+
+ protected abstract String getApiKey();
+
+ protected abstract String getApiSecret();
+
+ protected abstract String getCallbackUrl();
+
+ protected abstract void onInitialize(OAuth20Service service, OAuth2AccessToken token);
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/imports/OAuthServiceAwareCallable.java b/server-core/src/main/java/io/onedev/server/web/page/project/imports/OAuthServiceAwareCallable.java
new file mode 100644
index 0000000000..3f9e7a3fb5
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/imports/OAuthServiceAwareCallable.java
@@ -0,0 +1,11 @@
+package io.onedev.server.web.page.project.imports;
+
+import java.io.Serializable;
+
+import com.github.scribejava.core.oauth.OAuth20Service;
+
+public interface OAuthServiceAwareCallable<T> extends Serializable {
+
+ T call(OAuth20Service service);
+
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/imports/ProjectImportPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/imports/ProjectImportPage.html
new file mode 100644
index 0000000000..dcee3377e1
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/imports/ProjectImportPage.html
@@ -0,0 +1,7 @@
+<wicket:extend>
+ <div class="project-import card m-2 m-sm-5">
+ <div class="card-body">
+ <div wicket:id="content"></div>
+ </div>
+ </div>
+</wicket:extend>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/imports/ProjectImportPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/imports/ProjectImportPage.java
new file mode 100644
index 0000000000..ec3d714163
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/imports/ProjectImportPage.java
@@ -0,0 +1,62 @@
+package io.onedev.server.web.page.project.imports;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.web.page.layout.LayoutPage;
+
+@SuppressWarnings("serial")
+public class ProjectImportPage extends LayoutPage {
+
+ public static final String MOUNT_PATH = "import";
+
+ private static final String PARAM_STAGE = "stage";
+
+ public static final String STAGE_INITIATE = "initiate";
+
+ public static final String STAGE_CALLBACK = "callback";
+
+ private static final String PARAM_IMPORTER = "importer";
+
+ private ProjectImporter importer;
+
+ public ProjectImportPage(PageParameters params) {
+ super(params);
+
+ String importerName = params.get(PARAM_IMPORTER).toString();
+ for (ProjectImporterContribution contribution: OneDev.getExtensions(ProjectImporterContribution.class)) {
+ for (ProjectImporter importer: contribution.getImporters()) {
+ if (importer.getName().equals(importerName)) {
+ this.importer = importer;
+ break;
+ }
+ }
+ }
+
+ if (importer == null)
+ throw new RuntimeException("Unexpected importer: " + importerName);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(importer.render("content"));
+ }
+
+ @Override
+ protected Component newTopbarTitle(String componentId) {
+ return new Label(componentId, "Importing Projects from " + importer.getName());
+ }
+
+ public boolean isCallbackStage() {
+ return STAGE_CALLBACK.equals(getPageParameters().get(PARAM_STAGE).toString());
+ }
+
+ public static void addParams(PageParameters params, String stage, String importer) {
+ params.add(PARAM_STAGE, stage);
+ params.add(PARAM_IMPORTER, importer);
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/imports/ProjectImportPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/imports/ProjectImportPanel.java
new file mode 100644
index 0000000000..d0d5daa508
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/imports/ProjectImportPanel.java
@@ -0,0 +1,17 @@
+package io.onedev.server.web.page.project.imports;
+
+import org.apache.wicket.markup.html.panel.Panel;
+
+public abstract class ProjectImportPanel extends Panel {
+
+ private static final long serialVersionUID = 1L;
+
+ public ProjectImportPanel(String id) {
+ super(id);
+ }
+
+ protected ProjectImportPage getImportPage() {
+ return (ProjectImportPage) getPage();
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/imports/ProjectImporter.java b/server-core/src/main/java/io/onedev/server/web/page/project/imports/ProjectImporter.java
new file mode 100644
index 0000000000..f30be3bbcc
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/imports/ProjectImporter.java
@@ -0,0 +1,11 @@
+package io.onedev.server.web.page.project.imports;
+
+import java.io.Serializable;
+
+public interface ProjectImporter extends Serializable {
+
+ String getName();
+
+ ProjectImportPanel render(String componentId);
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/imports/ProjectImporterContribution.java b/server-core/src/main/java/io/onedev/server/web/page/project/imports/ProjectImporterContribution.java
new file mode 100644
index 0000000000..498cbb14e3
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/imports/ProjectImporterContribution.java
@@ -0,0 +1,12 @@
+package io.onedev.server.web.page.project.imports;
+
+import java.util.Collection;
+
+import io.onedev.commons.launcher.loader.ExtensionPoint;
+
+@ExtensionPoint
+public interface ProjectImporterContribution {
+
+ Collection<ProjectImporter> getImporters();
+
+}
diff --git a/server-plugin/server-plugin-github/src/main/java/io/onedev/server/plugin/github/GitHubCallbackPage.java b/server-plugin/server-plugin-github/src/main/java/io/onedev/server/plugin/github/GitHubCallbackPage.java
index bdb15a27f4..831d6dfa6f 100644
--- a/server-plugin/server-plugin-github/src/main/java/io/onedev/server/plugin/github/GitHubCallbackPage.java
+++ b/server-plugin/server-plugin-github/src/main/java/io/onedev/server/plugin/github/GitHubCallbackPage.java
@@ -5,20 +5,46 @@ import org.apache.wicket.core.request.handler.PageProvider;
import org.apache.wicket.core.request.handler.RenderPageRequestHandler.RedirectPolicy;
import org.apache.wicket.request.mapper.parameter.PageParameters;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.web.page.admin.sso.SsoProcessPage;
import io.onedev.server.web.page.base.BasePage;
+import io.onedev.server.web.page.project.imports.ProjectImportPage;
+/**
+ * The landing page for GitHub oauth callbacks. Request will be dispatched to other pages for
+ * further processing based on state param
+ *
+ * @author robin
+ *
+ */
@SuppressWarnings("serial")
public class GitHubCallbackPage extends BasePage {
public static final String MOUNT_PATH = "github-callback";
+ private static final String PARAM_STATE = "state";
+
public GitHubCallbackPage(PageParameters params) {
super(params);
- SsoProcessPage.addParams(params, SsoProcessPage.STAGE_CALLBACK, GitHubPluginModule.SSO_CONNECTOR_NAME);
- PageProvider pageProvider = new PageProvider(SsoProcessPage.class, params);
+ PageProvider pageProvider;
+
+ String state = params.get(PARAM_STATE).toString();
+ if (state.startsWith(GitHubImportPanel.STATE_PREFIX)) {
+ ProjectImportPage.addParams(params, ProjectImportPage.STAGE_CALLBACK, GitHubImporter.NAME);
+ pageProvider = new PageProvider(ProjectImportPage.class, params);
+ } else {
+ SsoProcessPage.addParams(params, SsoProcessPage.STAGE_CALLBACK, GitHubConnector.NAME);
+ pageProvider = new PageProvider(SsoProcessPage.class, params);
+ }
throw new RestartResponseException(pageProvider, RedirectPolicy.NEVER_REDIRECT);
}
+ public static String getUrl() {
+ SettingManager settingManager = OneDev.getInstance(SettingManager.class);
+ String serverUrl = settingManager.getSystemSetting().getServerUrl();
+ return serverUrl + "/" + GitHubCallbackPage.MOUNT_PATH;
+ }
+
}
diff --git a/server-plugin/server-plugin-github/src/main/java/io/onedev/server/plugin/github/GitHubConnector.java b/server-plugin/server-plugin-github/src/main/java/io/onedev/server/plugin/github/GitHubConnector.java
new file mode 100644
index 0000000000..66bb60a7ae
--- /dev/null
+++ b/server-plugin/server-plugin-github/src/main/java/io/onedev/server/plugin/github/GitHubConnector.java
@@ -0,0 +1,108 @@
+package io.onedev.server.plugin.github;
+
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+
+import org.apache.shiro.authc.AuthenticationException;
+import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.apache.wicket.request.resource.PackageResourceReference;
+import org.apache.wicket.request.resource.ResourceReference;
+
+import com.nimbusds.oauth2.sdk.ParseException;
+import com.nimbusds.oauth2.sdk.SerializeException;
+import com.nimbusds.oauth2.sdk.http.HTTPResponse;
+import com.nimbusds.oauth2.sdk.token.BearerAccessToken;
+import com.nimbusds.openid.connect.sdk.OIDCAccessTokenResponse;
+import com.nimbusds.openid.connect.sdk.UserInfoErrorResponse;
+import com.nimbusds.openid.connect.sdk.UserInfoRequest;
+
+import io.onedev.commons.utils.StringUtils;
+import io.onedev.server.model.support.administration.sso.SsoAuthenticated;
+import io.onedev.server.plugin.sso.openid.OpenIdConnector;
+import io.onedev.server.plugin.sso.openid.ProviderMetadata;
+import net.minidev.json.JSONObject;
+
+public class GitHubConnector extends OpenIdConnector {
+
+ private static final long serialVersionUID = 1L;
+
+ public static final String NAME = "GitHub";
+
+ private final GitHubSetting setting;
+
+ public GitHubConnector(GitHubSetting setting) {
+ this.setting = setting;
+ }
+
+ @Override
+ public String getName() {
+ return NAME;
+ }
+
+ @Override
+ public String getClientId() {
+ return setting.getClientId();
+ }
+
+ @Override
+ public String getClientSecret() {
+ return setting.getClientSecret();
+ }
+
+ @Override
+ protected ProviderMetadata discoverProviderMetadata() {
+ return new ProviderMetadata(
+ "https://github.com",
+ "https://github.com/login/oauth/authorize",
+ "https://github.com/login/oauth/access_token",
+ "https://api.github.com/user");
+ }
+
+ @Override
+ public String getButtonImageUrl() {
+ ResourceReference logo = new PackageResourceReference(GitHubPluginModule.class, "octocat.png");
+ return RequestCycle.get().urlFor(logo, new PageParameters()).toString();
+ }
+
+ @Override
+ protected SsoAuthenticated processTokenResponse(OIDCAccessTokenResponse tokenSuccessResponse) {
+ BearerAccessToken accessToken = (BearerAccessToken) tokenSuccessResponse.getAccessToken();
+
+ try {
+ UserInfoRequest userInfoRequest = new UserInfoRequest(
+ new URI(getCachedProviderMetadata().getUserInfoEndpoint()), accessToken);
+ HTTPResponse httpResponse = userInfoRequest.toHTTPRequest().send();
+
+ if (httpResponse.getStatusCode() == HTTPResponse.SC_OK) {
+ JSONObject json = httpResponse.getContentAsJSONObject();
+ String userName = (String) json.get("login");
+ String email = (String) json.get("email");
+ if (StringUtils.isBlank(email))
+ throw new AuthenticationException("A public email is required");
+ String fullName = (String) json.get("name");
+
+ return new SsoAuthenticated(userName, userName, email, fullName, null, null, this);
+ } else {
+ throw buildException(UserInfoErrorResponse.parse(httpResponse).getErrorObject());
+ }
+ } catch (SerializeException | ParseException | URISyntaxException | IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ @Override
+ public boolean isManagingMemberships() {
+ return false;
+ }
+
+ protected URI getCallbackUri() {
+ try {
+ return new URI(GitHubCallbackPage.getUrl());
+ } catch (URISyntaxException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+}
diff --git a/server-plugin/server-plugin-github/src/main/java/io/onedev/server/plugin/github/GitHubImportPanel.html b/server-plugin/server-plugin-github/src/main/java/io/onedev/server/plugin/github/GitHubImportPanel.html
new file mode 100644
index 0000000000..50d5bd2526
--- /dev/null
+++ b/server-plugin/server-plugin-github/src/main/java/io/onedev/server/plugin/github/GitHubImportPanel.html
@@ -0,0 +1,3 @@
+<wicket:panel>
+ Hello GitHub
+</wicket:panel>
\ No newline at end of file
diff --git a/server-plugin/server-plugin-github/src/main/java/io/onedev/server/plugin/github/GitHubImportPanel.java b/server-plugin/server-plugin-github/src/main/java/io/onedev/server/plugin/github/GitHubImportPanel.java
new file mode 100644
index 0000000000..e5c2cc9e66
--- /dev/null
+++ b/server-plugin/server-plugin-github/src/main/java/io/onedev/server/plugin/github/GitHubImportPanel.java
@@ -0,0 +1,44 @@
+package io.onedev.server.plugin.github;
+
+import com.github.scribejava.apis.GitHubApi;
+import com.github.scribejava.core.builder.api.DefaultApi20;
+import com.github.scribejava.core.model.OAuth2AccessToken;
+import com.github.scribejava.core.oauth.OAuth20Service;
+
+import io.onedev.server.web.page.project.imports.OAuthAwareImportPanel;
+
+@SuppressWarnings("serial")
+public class GitHubImportPanel extends OAuthAwareImportPanel {
+
+ private final GitHubSetting setting;
+
+ public GitHubImportPanel(String id, GitHubSetting setting) {
+ super(id);
+ this.setting = setting;
+ }
+
+ @Override
+ protected DefaultApi20 getApiEndpoint() {
+ return GitHubApi.instance();
+ }
+
+ @Override
+ protected String getApiKey() {
+ return setting.getClientId();
+ }
+
+ @Override
+ protected String getApiSecret() {
+ return setting.getClientSecret();
+ }
+
+ @Override
+ protected String getCallbackUrl() {
+ return GitHubCallbackPage.getUrl();
+ }
+
+ @Override
+ protected void onInitialize(OAuth20Service service, OAuth2AccessToken token) {
+ }
+
+}
diff --git a/server-plugin/server-plugin-github/src/main/java/io/onedev/server/plugin/github/GitHubImporter.java b/server-plugin/server-plugin-github/src/main/java/io/onedev/server/plugin/github/GitHubImporter.java
new file mode 100644
index 0000000000..00a2d4a39b
--- /dev/null
+++ b/server-plugin/server-plugin-github/src/main/java/io/onedev/server/plugin/github/GitHubImporter.java
@@ -0,0 +1,28 @@
+package io.onedev.server.plugin.github;
+
+import io.onedev.server.web.page.project.imports.ProjectImportPanel;
+import io.onedev.server.web.page.project.imports.ProjectImporter;
+
+public class GitHubImporter implements ProjectImporter {
+
+ private static final long serialVersionUID = 1L;
+
+ public static final String NAME = "GitHub";
+
+ private final GitHubSetting setting;
+
+ public GitHubImporter(GitHubSetting setting) {
+ this.setting = setting;
+ }
+
+ @Override
+ public String getName() {
+ return NAME;
+ }
+
+ @Override
+ public ProjectImportPanel render(String componentId) {
+ return new GitHubImportPanel(componentId, setting);
+ }
+
+}
\ No newline at end of file
diff --git a/server-plugin/server-plugin-github/src/main/java/io/onedev/server/plugin/github/GitHubPluginModule.java b/server-plugin/server-plugin-github/src/main/java/io/onedev/server/plugin/github/GitHubPluginModule.java
index 9518745a39..fa9c446363 100644
--- a/server-plugin/server-plugin-github/src/main/java/io/onedev/server/plugin/github/GitHubPluginModule.java
+++ b/server-plugin/server-plugin-github/src/main/java/io/onedev/server/plugin/github/GitHubPluginModule.java
@@ -1,41 +1,22 @@
package io.onedev.server.plugin.github;
-import java.io.IOException;
import java.io.Serializable;
-import java.net.URI;
-import java.net.URISyntaxException;
import java.util.Collection;
-import java.util.List;
-import org.apache.shiro.authc.AuthenticationException;
import org.apache.wicket.protocol.http.WebApplication;
-import org.apache.wicket.request.cycle.RequestCycle;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.apache.wicket.request.resource.PackageResourceReference;
-import org.apache.wicket.request.resource.ResourceReference;
import com.google.common.collect.Lists;
-import com.nimbusds.oauth2.sdk.ParseException;
-import com.nimbusds.oauth2.sdk.SerializeException;
-import com.nimbusds.oauth2.sdk.http.HTTPResponse;
-import com.nimbusds.oauth2.sdk.token.BearerAccessToken;
-import com.nimbusds.openid.connect.sdk.OIDCAccessTokenResponse;
-import com.nimbusds.openid.connect.sdk.UserInfoErrorResponse;
-import com.nimbusds.openid.connect.sdk.UserInfoRequest;
import io.onedev.commons.launcher.loader.AbstractPluginModule;
-import io.onedev.commons.utils.StringUtils;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.SettingManager;
-import io.onedev.server.model.support.administration.sso.SsoAuthenticated;
import io.onedev.server.model.support.administration.sso.SsoConnector;
import io.onedev.server.model.support.administration.sso.SsoConnectorContribution;
-import io.onedev.server.plugin.sso.openid.OpenIdConnector;
-import io.onedev.server.plugin.sso.openid.ProviderMetadata;
import io.onedev.server.web.WebApplicationConfigurator;
import io.onedev.server.web.mapper.DynamicPathPageMapper;
import io.onedev.server.web.page.layout.AdministrationSettingContribution;
-import net.minidev.json.JSONObject;
+import io.onedev.server.web.page.project.imports.ProjectImporter;
+import io.onedev.server.web.page.project.imports.ProjectImporterContribution;
/**
* NOTE: Do not forget to rename moduleClass property defined in the pom if you've renamed this class.
@@ -43,8 +24,6 @@ import net.minidev.json.JSONObject;
*/
public class GitHubPluginModule extends AbstractPluginModule {
- public static final String SSO_CONNECTOR_NAME = "GitHub";
-
@Override
protected void configure() {
super.configure();
@@ -68,95 +47,36 @@ public class GitHubPluginModule extends AbstractPluginModule {
});
+ contribute(ProjectImporterContribution.class, new ProjectImporterContribution() {
+
+ @Override
+ public Collection<ProjectImporter> getImporters() {
+ Collection<ProjectImporter> importers = Lists.newArrayList();
+ GitHubSetting setting = getSettingManager().getContributedSetting(GitHubSetting.class);
+ if (setting != null)
+ importers.add(new GitHubImporter(setting));
+ return importers;
+ }
+
+ });
+
contribute(SsoConnectorContribution.class, new SsoConnectorContribution() {
@Override
public Collection<SsoConnector> getSsoConnectors() {
- List<SsoConnector> connectors = Lists.newArrayList();
- SettingManager settingManager = OneDev.getInstance(SettingManager.class);
- GitHubSetting setting = settingManager.getContributedSetting(GitHubSetting.class);
- if (setting != null) {
- connectors.add(new OpenIdConnector() {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public String getName() {
- return SSO_CONNECTOR_NAME;
- }
-
- @Override
- public String getClientId() {
- return setting.getClientId();
- }
-
- @Override
- public String getClientSecret() {
- return setting.getClientSecret();
- }
-
- @Override
- protected ProviderMetadata discoverProviderMetadata() {
- return new ProviderMetadata(
- "https://github.com",
- "https://github.com/login/oauth/authorize",
- "https://github.com/login/oauth/access_token",
- "https://api.github.com/user");
- }
-
- @Override
- public String getButtonImageUrl() {
- ResourceReference logo = new PackageResourceReference(GitHubPluginModule.class, "octocat.png");
- return RequestCycle.get().urlFor(logo, new PageParameters()).toString();
- }
-
- @Override
- protected SsoAuthenticated processTokenResponse(OIDCAccessTokenResponse tokenSuccessResponse) {
- BearerAccessToken accessToken = (BearerAccessToken) tokenSuccessResponse.getAccessToken();
-
- try {
- UserInfoRequest userInfoRequest = new UserInfoRequest(
- new URI(getCachedProviderMetadata().getUserInfoEndpoint()), accessToken);
- HTTPResponse httpResponse = userInfoRequest.toHTTPRequest().send();
-
- if (httpResponse.getStatusCode() == HTTPResponse.SC_OK) {
- JSONObject json = httpResponse.getContentAsJSONObject();
- String userName = (String) json.get("login");
- String email = (String) json.get("email");
- if (StringUtils.isBlank(email))
- throw new AuthenticationException("A public email is required");
- String fullName = (String) json.get("name");
-
- return new SsoAuthenticated(userName, userName, email, fullName, null, null, this);
- } else {
- throw buildException(UserInfoErrorResponse.parse(httpResponse).getErrorObject());
- }
- } catch (SerializeException | ParseException | URISyntaxException | IOException e) {
- throw new RuntimeException(e);
- }
- }
-
- @Override
- public boolean isManagingMemberships() {
- return false;
- }
-
- protected URI getCallbackUri() {
- String serverUrl = settingManager.getSystemSetting().getServerUrl();
- try {
- return new URI(serverUrl + "/" + GitHubCallbackPage.MOUNT_PATH);
- } catch (URISyntaxException e) {
- throw new RuntimeException(e);
- }
- }
-
- });
- }
+ Collection<SsoConnector> connectors = Lists.newArrayList();
+ GitHubSetting setting = getSettingManager().getContributedSetting(GitHubSetting.class);
+ if (setting != null)
+ connectors.add(new GitHubConnector(setting));
return connectors;
}
});
}
-
+
+ private SettingManager getSettingManager() {
+ return OneDev.getInstance(SettingManager.class);
+ }
+
}
diff --git a/server-plugin/server-plugin-github/src/main/java/io/onedev/server/plugin/github/GitHubSetting.java b/server-plugin/server-plugin-github/src/main/java/io/onedev/server/plugin/github/GitHubSetting.java
index a881e0ee84..8e807f8984 100644
--- a/server-plugin/server-plugin-github/src/main/java/io/onedev/server/plugin/github/GitHubSetting.java
+++ b/server-plugin/server-plugin-github/src/main/java/io/onedev/server/plugin/github/GitHubSetting.java
@@ -4,8 +4,6 @@ import java.io.Serializable;
import org.hibernate.validator.constraints.NotEmpty;
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.web.component.svg.SpriteImage;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.Password;
@@ -42,7 +40,7 @@ public class GitHubSetting implements Serializable {
@SuppressWarnings("unused")
private static String getDescription() {
- String callbackUrl = OneDev.getInstance(SettingManager.class).getSystemSetting().getServerUrl() + "/" + GitHubCallbackPage.MOUNT_PATH;
+ String callbackUrl = GitHubCallbackPage.getUrl();
String copyClipboardScript = String.format("new Clipboard(\"#copy-github-callback-url\", {text: function() {return \"%s\";}});", callbackUrl);
return String.format("Register OneDev as an OAuth application in GitHub and you will be able to:"
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 481fc5f9fa..5439c88ec9 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
@@ -299,7 +299,7 @@ public class OpenIdConnector extends SsoConnector {
try {
ClientID clientID = new ClientID(getClientId());
- State state = new State(UUID.randomUUID().toString());
+ State state = new State("OIDC-" + UUID.randomUUID().toString());
Session.get().setAttribute(SESSION_ATTR_STATE, state.getValue());
Session.get().setAttribute(SESSION_ATTR_PROVIDER_METADATA, discoverProviderMetadata());