Added Dockerfile and docker-compose.yml

Author: Nasruddin

.idea/compiler.xml

@@ -0,0 +1,31 @@
+#stage 1
+#Start with a base image containing Java runtime
+FROM openjdk:11-slim as build
+
+# Add Maintainer Info
+LABEL maintainer="Nasruddin <nasruddin.java@gmail.com>"
+
+# The application's jar file
+ARG JAR_FILE
+
+# Add the application's jar to the container
+COPY ${JAR_FILE} app.jar
+
+#unpackage jar file
+RUN mkdir -p target/dependency && (cd target/dependency; jar -xf /app.jar)
+
+#stage 2
+#Same Java runtime
+FROM openjdk:11-slim
+
+#Add volume pointing to /tmp
+VOLUME /tmp
+
+#Copy unpackaged application to new container
+ARG DEPENDENCY=/target/dependency
+COPY --from=build ${DEPENDENCY}/BOOT-INF/lib /app/lib
+COPY --from=build ${DEPENDENCY}/META-INF /app/META-INF
+COPY --from=build ${DEPENDENCY}/BOOT-INF/classes /app
+
+#execute the application
+ENTRYPOINT ["java","-cp","app:app/lib/*","com.javatab.apigatewayservice.ApiGatewayServiceApplication"]

.idea/encodings.xml

@@ -12,7 +12,7 @@
 
 	<groupId>com.javatab</groupId>
 	<artifactId>api-gateway-service</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
+	<version>1.0.0</version>
 	<name>api-gateway-service</name>
 	<description>Demo project for Spring Boot</description>
 
@@ -39,6 +39,10 @@
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-netflix-zuul</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-config</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-devtools</artifactId>
@@ -107,7 +111,6 @@
 						<phase>install</phase>
 						<goals>
 							<goal>build</goal>
-							<goal>push</goal>
 						</goals>
 					</execution>
 				</executions>

.idea/misc.xml

@@ -1,6 +1,5 @@
 package com.javatab.apigatewayservice.security;
 
-import com.javatab.commonservice.JwtConfig;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jwts;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
@@ -18,27 +17,21 @@
 
 public class JwtTokenAuthenticationFilter extends OncePerRequestFilter {
 
-    private final JwtConfig jwtConfig;
-
-    public JwtTokenAuthenticationFilter(JwtConfig jwtConfig) {
-        this.jwtConfig = jwtConfig;
-    }
-
     @Override
     protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain)
             throws ServletException, IOException {
 
-        String header = request.getHeader(jwtConfig.getHeader());
+        String header = request.getHeader("Authorization");
 
-        if(header == null || !header.startsWith(jwtConfig.getPrefix())) {
+        if(header == null || !header.startsWith("Bearer")) {
             chain.doFilter(request, response);  		// If not valid, go to the next filter.
             return;
         }
-        String token = header.replace(jwtConfig.getPrefix(), "");
+        String token = header.replace("Bearer", "");
 
         try {
             Claims claims = Jwts.parser()
-                    .setSigningKey(jwtConfig.getSecret().getBytes())
+                    .setSigningKey("JwtSecretKey".getBytes())
                     .parseClaimsJws(token)
                     .getBody();
 

api-gateway-service/Dockerfile

@@ -1,7 +1,5 @@
 package com.javatab.apigatewayservice.security;
 
-import com.javatab.commonservice.JwtConfig;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.http.HttpMethod;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
@@ -18,10 +16,8 @@
 import java.util.Collections;
 import java.util.stream.Collectors;
 
-@EnableWebSecurity 	// Enable security config. This annotation denotes config for spring security.
+@EnableWebSecurity
 public class SecurityTokenConfig extends WebSecurityConfigurerAdapter {
-    @Autowired
-    private JwtConfig jwtConfig;
 
     @Override
     protected void configure(HttpSecurity http) throws Exception {
@@ -32,9 +28,9 @@ protected void configure(HttpSecurity http) throws Exception {
                 .and()
                 .exceptionHandling().authenticationEntryPoint((req, rsp, e) -> rsp.sendError(HttpServletResponse.SC_UNAUTHORIZED))
                 .and()
-                .addFilterAfter(new JwtTokenAuthenticationFilter(jwtConfig), UsernamePasswordAuthenticationFilter.class)
+                .addFilterAfter(new JwtTokenAuthenticationFilter(), UsernamePasswordAuthenticationFilter.class)
                 .authorizeRequests()
-                .antMatchers(HttpMethod.POST, jwtConfig.getUri()).permitAll()
+                .antMatchers(HttpMethod.POST, "/auth/**").permitAll()
                 .antMatchers("/admin/**").hasRole("ADMIN")
                 .anyRequest().authenticated();
 
@@ -51,9 +47,4 @@ public CorsFilter corsFilter() {
         source.registerCorsConfiguration("/**", config);
         return new CorsFilter(source);
     }
-
-    @Bean
-    public JwtConfig jwtConfig() {
-        return new JwtConfig();
-    }
 }

api-gateway-service/pom.xml

@@ -0,0 +1,9 @@
+spring:
+  application:
+    name: api-gateway-service
+  cloud:
+    config:
+      uri: http://config-server:8071 # using old spring config, upgrade!
+      discovery:
+        service-id: config-server
+        enabled: true

api-gateway-service/src/main/java/com/javatab/apigatewayservice/security/JwtTokenAuthenticationFilter.java

@@ -0,0 +1,31 @@
+#stage 1
+#Start with a base image containing Java runtime
+FROM openjdk:11-slim as build
+
+# Add Maintainer Info
+LABEL maintainer="Nasruddin <nasruddin.java@gmail.com>"
+
+# The application's jar file
+ARG JAR_FILE
+
+# Add the application's jar to the container
+COPY ${JAR_FILE} app.jar
+
+#unpackage jar file
+RUN mkdir -p target/dependency && (cd target/dependency; jar -xf /app.jar)
+
+#stage 2
+#Same Java runtime
+FROM openjdk:11-slim
+
+#Add volume pointing to /tmp
+VOLUME /tmp
+
+#Copy unpackaged application to new container
+ARG DEPENDENCY=/target/dependency
+COPY --from=build ${DEPENDENCY}/BOOT-INF/lib /app/lib
+COPY --from=build ${DEPENDENCY}/META-INF /app/META-INF
+COPY --from=build ${DEPENDENCY}/BOOT-INF/classes /app
+
+#execute the application
+ENTRYPOINT ["java","-cp","app:app/lib/*","com.javatab.authservice.AuthServiceApplication"]