Skip to content

The Unified and Autonomous Development Platform

Fix issue #299 - Kubernetes executor no longer works in 4.4

Robin Shen369d640aa850
diff --git a/server-core/src/main/java/io/onedev/server/rest/annotation/Api.java b/server-core/src/main/java/io/onedev/server/rest/annotation/Api.java
index f90c4829e7..7d43ad97d4 100644
--- a/server-core/src/main/java/io/onedev/server/rest/annotation/Api.java
+++ b/server-core/src/main/java/io/onedev/server/rest/annotation/Api.java
@@ -9,7 +9,7 @@ import java.lang.annotation.Target;
@Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER})
public @interface Api {
- boolean exclude() default false;
+ boolean internal() default false;
String exampleProvider() default "";
diff --git a/server-core/src/main/java/io/onedev/server/rest/jersey/AnonymousCheckFilter.java b/server-core/src/main/java/io/onedev/server/rest/jersey/AnonymousCheckFilter.java
index 08ab0fc9cc..b5d107c154 100644
--- a/server-core/src/main/java/io/onedev/server/rest/jersey/AnonymousCheckFilter.java
+++ b/server-core/src/main/java/io/onedev/server/rest/jersey/AnonymousCheckFilter.java
@@ -6,12 +6,14 @@ import javax.inject.Inject;
import javax.servlet.http.HttpServletRequest;
import javax.ws.rs.container.ContainerRequestContext;
import javax.ws.rs.container.ContainerRequestFilter;
+import javax.ws.rs.container.ResourceInfo;
import javax.ws.rs.core.Context;
import javax.ws.rs.ext.Provider;
import org.apache.shiro.authz.UnauthenticatedException;
import io.onedev.server.entitymanager.SettingManager;
+import io.onedev.server.rest.annotation.Api;
import io.onedev.server.security.SecurityUtils;
@Provider
@@ -19,6 +21,9 @@ public class AnonymousCheckFilter implements ContainerRequestFilter {
private final SettingManager settingManager;
+ @Context
+ private ResourceInfo resourceInfo;
+
@Context
private HttpServletRequest request;
@@ -29,7 +34,8 @@ public class AnonymousCheckFilter implements ContainerRequestFilter {
@Override
public void filter(ContainerRequestContext requestContext) throws IOException {
- if (SecurityUtils.getUser() == null) {
+ Api api = resourceInfo.getResourceClass().getAnnotation(Api.class);
+ if ((api == null || !api.internal()) && SecurityUtils.getUser() == null) {
String method = request.getMethod();
if (method.equals("POST") || method.equals("DELETE") || method.equals("PUT")
|| !settingManager.getSecuritySetting().isEnableAnonymousAccess()) {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/help/ExampleValuePanel.java b/server-core/src/main/java/io/onedev/server/web/page/help/ExampleValuePanel.java
index d3fe35d4ac..e7f12f2bed 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/help/ExampleValuePanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/help/ExampleValuePanel.java
@@ -70,7 +70,7 @@ public class ExampleValuePanel extends Panel {
for (Class<?> clazz: config.getClasses()) {
if (clazz.getAnnotation(Path.class) != null) {
Api api = clazz.getAnnotation(Api.class);
- if (api == null || !api.exclude()) {
+ if (api == null || !api.internal()) {
for (Method method: clazz.getMethods()) {
if (AbstractEntity.class.isAssignableFrom(method.getReturnType())
&& method.getAnnotation(GET.class) != null
diff --git a/server-core/src/main/java/io/onedev/server/web/page/help/ResourceListPage.java b/server-core/src/main/java/io/onedev/server/web/page/help/ResourceListPage.java
index 2a90a779ae..96ec3a9f27 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/help/ResourceListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/help/ResourceListPage.java
@@ -39,7 +39,7 @@ public class ResourceListPage extends ApiHelpPage {
for (Class<?> clazz: config.getClasses()) {
if (clazz.getAnnotation(Path.class) != null) {
Api api = clazz.getAnnotation(Api.class);
- if (api == null || !api.exclude())
+ if (api == null || !api.internal())
clazzes.add(clazz);
}
}
diff --git a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesResource.java b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesResource.java
index 3c450199c9..e9b8eea5e3 100644
--- a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesResource.java
+++ b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesResource.java
@@ -49,7 +49,7 @@ import io.onedev.server.rest.annotation.Api;
import io.onedev.server.util.ExceptionUtils;
import io.onedev.server.util.SimpleLogger;
-@Api(exclude=true)
+@Api(internal=true)
@Path("/k8s")
@Consumes(MediaType.WILDCARD)
@Singleton