Skip to content

Commit 9606dd3

Browse files
leon-liangleon-liang
committed
testing
1 parent fd39524 commit 9606dd3

File tree

9 files changed

+211
-212
lines changed

9 files changed

+211
-212
lines changed

‎.github/workflows/deploy-to-k8.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ jobs:
6464
tags: ghcr.io/${{ env.REPO }}/server:develop
6565
platforms: linux/amd64
6666

67-
6867
- name: Set up Kubeconfig
6968
run: |
7069
echo "${{ secrets.KUBECONFIG }}" > kubeconfig

‎server/src/main/java/de/tum/cit/aet/devops/teamserverdown/config/OpenAPIConfiguration.java‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package de.tum.cit.aet.devops.teamserverdown.config;
22

3-
import de.tum.cit.aet.devops.teamserverdown.security.CurrentUser;
3+
//import de.tum.cit.aet.devops.teamserverdown.security.CurrentUser;
44
import io.swagger.v3.oas.models.ExternalDocumentation;
55
import io.swagger.v3.oas.models.OpenAPI;
66
import io.swagger.v3.oas.models.Operation;
@@ -31,31 +31,31 @@ public OpenAPI openAPI() {
3131
.url("https://github.com/AET-DevOps25/team-server-down"));
3232
}
3333

34-
@Bean
35-
public OperationCustomizer hideCurrentUser() {
36-
return (Operation operation, HandlerMethod handlerMethod) -> {
37-
if (operation.getParameters() == null) {
38-
return operation;
39-
}
40-
41-
MethodParameter[] methodParameters = handlerMethod.getMethodParameters();
42-
List<Parameter> openApiParams = operation.getParameters();
43-
44-
Iterator<Parameter> paramIterator = openApiParams.iterator();
45-
while (paramIterator.hasNext()) {
46-
Parameter openApiParam = paramIterator.next();
47-
for (MethodParameter methodParam : methodParameters) {
48-
if (methodParam.hasParameterAnnotation(CurrentUser.class)) {
49-
String methodParamName = methodParam.getParameterName();
50-
if (methodParamName == null || openApiParam.getName().equals(methodParamName)) {
51-
paramIterator.remove();
52-
break;
53-
}
54-
}
55-
}
56-
}
57-
58-
return operation;
59-
};
60-
}
34+
// @Bean
35+
// public OperationCustomizer hideCurrentUser() {
36+
// return (Operation operation, HandlerMethod handlerMethod) -> {
37+
// if (operation.getParameters() == null) {
38+
// return operation;
39+
// }
40+
//
41+
// MethodParameter[] methodParameters = handlerMethod.getMethodParameters();
42+
// List<Parameter> openApiParams = operation.getParameters();
43+
//
44+
// Iterator<Parameter> paramIterator = openApiParams.iterator();
45+
// while (paramIterator.hasNext()) {
46+
// Parameter openApiParam = paramIterator.next();
47+
// for (MethodParameter methodParam : methodParameters) {
48+
// if (methodParam.hasParameterAnnotation(CurrentUser.class)) {
49+
// String methodParamName = methodParam.getParameterName();
50+
// if (methodParamName == null || openApiParam.getName().equals(methodParamName)) {
51+
// paramIterator.remove();
52+
// break;
53+
// }
54+
// }
55+
// }
56+
// }
57+
//
58+
// return operation;
59+
// };
60+
// }
6161
}

‎server/src/main/java/de/tum/cit/aet/devops/teamserverdown/config/SecurityConfiguration.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import java.util.List;
44

5-
import de.tum.cit.aet.devops.teamserverdown.security.JWTAuthenticationFilter;
5+
//import de.tum.cit.aet.devops.teamserverdown.security.JWTAuthenticationFilter;
66
import org.springframework.context.annotation.Bean;
77
import org.springframework.context.annotation.Configuration;
88
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
@@ -18,11 +18,11 @@
1818
@EnableWebSecurity
1919
public class SecurityConfiguration {
2020

21-
private final JWTAuthenticationFilter jwtAuthenticationFilter;
22-
23-
public SecurityConfiguration(JWTAuthenticationFilter jwtAuthenticationFilter) {
24-
this.jwtAuthenticationFilter = jwtAuthenticationFilter;
25-
}
21+
// private final JWTAuthenticationFilter jwtAuthenticationFilter;
22+
//
23+
// public SecurityConfiguration(JWTAuthenticationFilter jwtAuthenticationFilter) {
24+
// this.jwtAuthenticationFilter = jwtAuthenticationFilter;
25+
// }
2626

2727
@Bean
2828
public SecurityFilterChain securityFilterChain(
@@ -31,8 +31,8 @@ public SecurityFilterChain securityFilterChain(
3131
http.cors(cors -> {})
3232
.httpBasic(AbstractHttpConfigurer::disable)
3333
.formLogin(AbstractHttpConfigurer::disable)
34-
.sessionManagement(session -> session.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
35-
.addFilterBefore(jwtAuthenticationFilter, UsernamePasswordAuthenticationFilter.class);
34+
.sessionManagement(session -> session.sessionCreationPolicy(SessionCreationPolicy.STATELESS));
35+
// .addFilterBefore(jwtAuthenticationFilter, UsernamePasswordAuthenticationFilter.class);
3636

3737
return http.build();
3838
}

‎server/src/main/java/de/tum/cit/aet/devops/teamserverdown/config/WebConfiguration.java‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
package de.tum.cit.aet.devops.teamserverdown.config;
2-
3-
import de.tum.cit.aet.devops.teamserverdown.security.CurrentUserArgumentResolver;
4-
import java.util.List;
5-
import org.springframework.context.annotation.Configuration;
6-
import org.springframework.web.method.support.HandlerMethodArgumentResolver;
7-
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
8-
9-
@Configuration
10-
public class WebConfiguration implements WebMvcConfigurer {
11-
private final CurrentUserArgumentResolver currentUserArgumentResolver;
12-
13-
public WebConfiguration(CurrentUserArgumentResolver currentUserArgumentResolver) {
14-
this.currentUserArgumentResolver = currentUserArgumentResolver;
15-
}
16-
17-
@Override
18-
public void addArgumentResolvers(List<HandlerMethodArgumentResolver> resolvers) {
19-
resolvers.add(currentUserArgumentResolver);
20-
}
21-
}
1+
//package de.tum.cit.aet.devops.teamserverdown.config;
2+
//
3+
//import de.tum.cit.aet.devops.teamserverdown.security.CurrentUserArgumentResolver;
4+
//import java.util.List;
5+
//import org.springframework.context.annotation.Configuration;
6+
//import org.springframework.web.method.support.HandlerMethodArgumentResolver;
7+
//import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
8+
//
9+
//@Configuration
10+
//public class WebConfiguration implements WebMvcConfigurer {
11+
// private final CurrentUserArgumentResolver currentUserArgumentResolver;
12+
//
13+
// public WebConfiguration(CurrentUserArgumentResolver currentUserArgumentResolver) {
14+
// this.currentUserArgumentResolver = currentUserArgumentResolver;
15+
// }
16+
//
17+
// @Override
18+
// public void addArgumentResolvers(List<HandlerMethodArgumentResolver> resolvers) {
19+
// resolvers.add(currentUserArgumentResolver);
20+
// }
21+
//}

‎server/src/main/java/de/tum/cit/aet/devops/teamserverdown/controller/AccountController.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package de.tum.cit.aet.devops.teamserverdown.controller;
22

33
import de.tum.cit.aet.devops.teamserverdown.model.User;
4-
import de.tum.cit.aet.devops.teamserverdown.security.CurrentUser;
4+
//import de.tum.cit.aet.devops.teamserverdown.security.CurrentUser;
55
import io.swagger.v3.oas.annotations.tags.Tag;
66
import org.springframework.web.bind.annotation.GetMapping;
77
import org.springframework.web.bind.annotation.RestController;

‎server/src/main/java/de/tum/cit/aet/devops/teamserverdown/security/CurrentUser.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package de.tum.cit.aet.devops.teamserverdown.security;
2-
3-
import java.lang.annotation.*;
4-
5-
@Target(ElementType.PARAMETER)
6-
@Retention(RetentionPolicy.RUNTIME)
7-
@Documented
8-
public @interface CurrentUser {}
1+
//package de.tum.cit.aet.devops.teamserverdown.security;
2+
//
3+
//import java.lang.annotation.*;
4+
//
5+
//@Target(ElementType.PARAMETER)
6+
//@Retention(RetentionPolicy.RUNTIME)
7+
//@Documented
8+
//public @interface CurrentUser {}

‎server/src/main/java/de/tum/cit/aet/devops/teamserverdown/security/CurrentUserArgumentResolver.java‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
1-
package de.tum.cit.aet.devops.teamserverdown.security;
2-
3-
import de.tum.cit.aet.devops.teamserverdown.model.User;
4-
import jakarta.servlet.http.HttpServletRequest;
5-
import org.springframework.core.MethodParameter;
6-
import org.springframework.stereotype.Component;
7-
import org.springframework.web.context.request.NativeWebRequest;
8-
import org.springframework.web.method.support.HandlerMethodArgumentResolver;
9-
import org.springframework.web.method.support.ModelAndViewContainer;
10-
11-
@Component
12-
public class CurrentUserArgumentResolver implements HandlerMethodArgumentResolver {
13-
@Override
14-
public boolean supportsParameter(MethodParameter parameter) {
15-
return parameter.hasParameterAnnotation(CurrentUser.class)
16-
&& parameter.getParameterType().equals(User.class);
17-
}
18-
19-
@Override
20-
public Object resolveArgument(
21-
MethodParameter parameter,
22-
ModelAndViewContainer mavContainer,
23-
NativeWebRequest webRequest,
24-
org.springframework.web.bind.support.WebDataBinderFactory binderFactory) {
25-
HttpServletRequest request = (HttpServletRequest) webRequest.getNativeRequest();
26-
return request.getAttribute("user");
27-
}
28-
}
1+
//package de.tum.cit.aet.devops.teamserverdown.security;
2+
//
3+
//import de.tum.cit.aet.devops.teamserverdown.model.User;
4+
//import jakarta.servlet.http.HttpServletRequest;
5+
//import org.springframework.core.MethodParameter;
6+
//import org.springframework.stereotype.Component;
7+
//import org.springframework.web.context.request.NativeWebRequest;
8+
//import org.springframework.web.method.support.HandlerMethodArgumentResolver;
9+
//import org.springframework.web.method.support.ModelAndViewContainer;
10+
//
11+
//@Component
12+
//public class CurrentUserArgumentResolver implements HandlerMethodArgumentResolver {
13+
// @Override
14+
// public boolean supportsParameter(MethodParameter parameter) {
15+
// return parameter.hasParameterAnnotation(CurrentUser.class)
16+
// && parameter.getParameterType().equals(User.class);
17+
// }
18+
//
19+
// @Override
20+
// public Object resolveArgument(
21+
// MethodParameter parameter,
22+
// ModelAndViewContainer mavContainer,
23+
// NativeWebRequest webRequest,
24+
// org.springframework.web.bind.support.WebDataBinderFactory binderFactory) {
25+
// HttpServletRequest request = (HttpServletRequest) webRequest.getNativeRequest();
26+
// return request.getAttribute("user");
27+
// }
28+
//}

‎server/src/main/java/de/tum/cit/aet/devops/teamserverdown/security/JWTAuthenticationFilter.java‎

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,55 @@
1-
package de.tum.cit.aet.devops.teamserverdown.security;
2-
3-
import com.auth0.jwt.exceptions.JWTVerificationException;
4-
import com.auth0.jwt.interfaces.DecodedJWT;
5-
import de.tum.cit.aet.devops.teamserverdown.model.User;
6-
import de.tum.cit.aet.devops.teamserverdown.services.UserService;
7-
import jakarta.servlet.FilterChain;
8-
import jakarta.servlet.ServletException;
9-
import jakarta.servlet.http.HttpServletRequest;
10-
import jakarta.servlet.http.HttpServletResponse;
11-
import java.io.IOException;
12-
import org.springframework.stereotype.Component;
13-
import org.springframework.web.filter.OncePerRequestFilter;
14-
15-
@Component
16-
public class JWTAuthenticationFilter extends OncePerRequestFilter {
17-
private final JWTValidator jwtValidator = new JWTValidator();
18-
private final UserService userService;
19-
20-
public JWTAuthenticationFilter(UserService userService) {
21-
this.userService = userService;
22-
}
23-
24-
@Override
25-
protected void doFilterInternal(
26-
HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
27-
throws ServletException, IOException {
28-
String authHeader = request.getHeader("Authorization");
29-
if (authHeader != null && authHeader.startsWith("Bearer ")) {
30-
String token = authHeader.substring(7);
31-
try {
32-
DecodedJWT decoded = jwtValidator.validateToken(token);
1+
//package de.tum.cit.aet.devops.teamserverdown.security;
2+
//
3+
//import com.auth0.jwt.exceptions.JWTVerificationException;
4+
//import com.auth0.jwt.interfaces.DecodedJWT;
5+
//import de.tum.cit.aet.devops.teamserverdown.model.User;
6+
//import de.tum.cit.aet.devops.teamserverdown.services.UserService;
7+
//import jakarta.servlet.FilterChain;
8+
//import jakarta.servlet.ServletException;
9+
//import jakarta.servlet.http.HttpServletRequest;
10+
//import jakarta.servlet.http.HttpServletResponse;
11+
//import java.io.IOException;
12+
//import org.springframework.stereotype.Component;
13+
//import org.springframework.web.filter.OncePerRequestFilter;
14+
//
15+
//@Component
16+
//public class JWTAuthenticationFilter extends OncePerRequestFilter {
17+
// private final JWTValidator jwtValidator = new JWTValidator();
18+
// private final UserService userService;
19+
//
20+
// public JWTAuthenticationFilter(UserService userService) {
21+
// this.userService = userService;
22+
// }
23+
//
24+
// @Override
25+
// protected void doFilterInternal(
26+
// HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
27+
// throws ServletException, IOException {
28+
// String authHeader = request.getHeader("Authorization");
29+
// if (authHeader != null && authHeader.startsWith("Bearer ")) {
30+
// String token = authHeader.substring(7);
31+
// try {
32+
// DecodedJWT decoded = jwtValidator.validateToken(token);
3333
// User user = userService.getOrCreateUser(decoded);
34-
34+
//
3535
// request.setAttribute("user", user);
36-
} catch (JWTVerificationException e) {
37-
response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
38-
response.getWriter().write("Invalid JWT token");
39-
return;
40-
}
41-
} else {
42-
response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
43-
response.getWriter().write("Missing Authorization header");
44-
return;
45-
}
46-
47-
filterChain.doFilter(request, response);
48-
}
49-
36+
// } catch (JWTVerificationException e) {
37+
// response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
38+
// response.getWriter().write("Invalid JWT token");
39+
// return;
40+
// }
41+
// } else {
42+
// response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
43+
// response.getWriter().write("Missing Authorization header");
44+
// return;
45+
// }
46+
//
47+
// filterChain.doFilter(request, response);
48+
// }
49+
//
5050
// @Override
5151
// protected boolean shouldNotFilter(HttpServletRequest request) {
5252
// String path = request.getServletPath();
5353
// return path.startsWith("/v3/api-docs") || path.startsWith("/swagger-ui");
5454
// }
55-
}
55+
//}

0 commit comments

Comments
 (0)