Skip to content

The Unified and Autonomous Development Platform

Fix issue #1267 - GitLab import error due to improper use of access token

Robin Shen77ced480239a
diff --git a/server-core/src/main/java/io/onedev/server/util/JerseyUtils.java b/server-core/src/main/java/io/onedev/server/util/JerseyUtils.java
index 83874f6e46..547232b848 100644
--- a/server-core/src/main/java/io/onedev/server/util/JerseyUtils.java
+++ b/server-core/src/main/java/io/onedev/server/util/JerseyUtils.java
@@ -1,18 +1,16 @@
package io.onedev.server.util;
-import java.util.List;
+import com.fasterxml.jackson.databind.JsonNode;
+import io.onedev.commons.utils.ExplicitException;
+import io.onedev.commons.utils.StringUtils;
+import io.onedev.commons.utils.TaskLogger;
import javax.annotation.Nullable;
import javax.ws.rs.client.Client;
import javax.ws.rs.client.Invocation;
import javax.ws.rs.client.WebTarget;
import javax.ws.rs.core.Response;
-
-import com.fasterxml.jackson.databind.JsonNode;
-
-import io.onedev.commons.utils.ExplicitException;
-import io.onedev.commons.utils.StringUtils;
-import io.onedev.commons.utils.TaskLogger;
+import java.util.List;
public class JerseyUtils {
diff --git a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/AccessTokenFilter.java b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/AccessTokenFilter.java
new file mode 100644
index 0000000000..06e82838ba
--- /dev/null
+++ b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/AccessTokenFilter.java
@@ -0,0 +1,23 @@
+package io.onedev.server.plugin.imports.gitlab;
+
+import javax.annotation.Priority;
+import javax.ws.rs.Priorities;
+import javax.ws.rs.client.ClientRequestContext;
+import javax.ws.rs.client.ClientRequestFilter;
+import java.io.IOException;
+
+@Priority(Priorities.AUTHENTICATION)
+class AccessTokenFilter implements ClientRequestFilter {
+
+ private final String accessToken;
+
+ public AccessTokenFilter(String accessToken) {
+ this.accessToken = accessToken;
+ }
+
+ @Override
+ public void filter(ClientRequestContext request) throws IOException {
+ request.getHeaders().add("Private-Token", accessToken);
+ }
+
+}
diff --git a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportServer.java b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportServer.java
index 06038a6e15..81dd253593 100644
--- a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportServer.java
+++ b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportServer.java
@@ -7,7 +7,11 @@ import io.onedev.commons.utils.ExplicitException;
import io.onedev.commons.utils.StringUtils;
import io.onedev.commons.utils.TaskLogger;
import io.onedev.server.OneDev;
+import io.onedev.server.annotation.ClassValidating;
+import io.onedev.server.annotation.Editable;
+import io.onedev.server.annotation.Password;
import io.onedev.server.attachment.AttachmentManager;
+import io.onedev.server.buildspecmodel.inputspec.InputSpec;
import io.onedev.server.entitymanager.*;
import io.onedev.server.entityreference.ReferenceMigrator;
import io.onedev.server.event.ListenerRegistry;
@@ -16,15 +20,11 @@ import io.onedev.server.git.command.LsRemoteCommand;
import io.onedev.server.model.*;
import io.onedev.server.model.support.LastActivity;
import io.onedev.server.model.support.administration.GlobalIssueSetting;
-import io.onedev.server.buildspecmodel.inputspec.InputSpec;
import io.onedev.server.model.support.issue.field.spec.FieldSpec;
import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.util.*;
import io.onedev.server.util.JerseyUtils.PageDataConsumer;
import io.onedev.server.validation.Validatable;
-import io.onedev.server.annotation.ClassValidating;
-import io.onedev.server.annotation.Editable;
-import io.onedev.server.annotation.Password;
import org.apache.http.client.utils.URIBuilder;
import org.glassfish.jersey.client.ClientProperties;
import org.glassfish.jersey.client.oauth2.OAuth2ClientSupport;
@@ -156,7 +156,10 @@ public class ImportServer implements Serializable, Validatable {
private Client newClient() {
Client client = ClientBuilder.newClient();
client.property(ClientProperties.FOLLOW_REDIRECTS, true);
- client.register(OAuth2ClientSupport.feature(getAccessToken()));
+
+ // Pass token with PRIVATE-TOKEN header to be compatible with old GitLab version
+ //client.register(OAuth2ClientSupport.feature(getAccessToken()));
+ client.register(new AccessTokenFilter(getAccessToken()));
return client;
}