config server authorization

anazri · Mar 5, 2016 · fbe4e01 · fbe4e01
1 parent fb64a0e
commit fbe4e01
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 19 deletions.
diff --git a/config/pom.xml b/config/pom.xml
@@ -28,6 +28,10 @@
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-config-server</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-security</artifactId>
+		</dependency>
 	</dependencies>
 
 	<dependencyManagement>

diff --git a/config/src/main/resources/application.yml b/config/src/main/resources/application.yml
@@ -8,4 +8,8 @@ spring:
      active: native
 
 server:
-  port: 8888
+  port: 8888
+
+security:
+  user:
+    password: ${CONFIG_SERVICE_PASSWORD}
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
@@ -1,16 +1,22 @@
 version: '2'
 services:
   config:
+    environment:
+      CONFIG_SERVICE_PASSWORD: dev-password
     build: config
     ports:
       - 8888:8888
 
   registry:
+    environment:
+      CONFIG_SERVICE_PASSWORD: dev-password
     build: registry
     ports:
       - 8761:8761
 
   gateway:
+    environment:
+      CONFIG_SERVICE_PASSWORD: dev-password
     build: gateway
 
 
@@ -34,6 +40,7 @@ services:
 
   account-service:
     environment:
+      CONFIG_SERVICE_PASSWORD: dev-password
       MONGODB_PASSWORD: dev-password
       ACCOUNT_SERVICE_PASSWORD: dev-password
     build: account-service
@@ -49,6 +56,7 @@ services:
 
   statistics-service:
     environment:
+      CONFIG_SERVICE_PASSWORD: dev-password
       MONGODB_PASSWORD: dev-password
       STATISTICS_SERVICE_PASSWORD: dev-password
     build: statistics-service
@@ -64,6 +72,7 @@ services:
 
   notification-service:
     environment:
+      CONFIG_SERVICE_PASSWORD: dev-password
       MONGODB_PASSWORD: dev-password
       NOTIFICATION_SERVICE_PASSWORD: dev-password
     build: notification-service

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,6 +1,8 @@
 version: '2'
 services:
   config:
+    environment:
+      CONFIG_SERVICE_PASSWORD:
     image: sqshq/piggymetrics-config
     restart: always
     logging:
@@ -9,6 +11,8 @@ services:
         max-file: "10"
 
   registry:
+    environment:
+      CONFIG_SERVICE_PASSWORD:
     image: sqshq/piggymetrics-registry
     restart: always
     logging:
@@ -17,6 +21,8 @@ services:
         max-file: "10"
 
   gateway:
+    environment:
+      CONFIG_SERVICE_PASSWORD:
     image: sqshq/piggymetrics-gateway
     restart: always
     ports:
@@ -28,83 +34,87 @@ services:
 
 
   auth-service:
-    image: sqshq/piggymetrics-auth-service
-    restart: always
     environment:
+      CONFIG_SERVICE_PASSWORD:
       NOTIFICATION_SERVICE_PASSWORD:
       STATISTICS_SERVICE_PASSWORD:
       ACCOUNT_SERVICE_PASSWORD:
       MONGODB_PASSWORD:
+    image: sqshq/piggymetrics-auth-service
+    restart: always
     logging:
       options:
         max-size: "10m"
         max-file: "10"
 
   auth-mongodb:
+    environment:
+      MONGODB_PASSWORD:
     build: mongodb
     image: sqshq/piggymetrics-auth-mongodb
     restart: always
-    environment:
-      MONGODB_PASSWORD:
     logging:
       options:
         max-size: "10m"
         max-file: "10"
 
 
   account-service:
-    image: sqshq/piggymetrics-account-service
-    restart: always
     environment:
+      CONFIG_SERVICE_PASSWORD:
       ACCOUNT_SERVICE_PASSWORD:
       MONGODB_PASSWORD:
+    image: sqshq/piggymetrics-account-service
+    restart: always
     logging:
       options:
         max-size: "10m"
         max-file: "10"
 
   account-mongodb:
-    build: mongodb
-    image: sqshq/piggymetrics-account-mongodb
-    restart: always
     environment:
       INIT_DUMP: account-service-dump.js
       MONGODB_PASSWORD:
+    build: mongodb
+    image: sqshq/piggymetrics-account-mongodb
+    restart: always
     logging:
       options:
         max-size: "10m"
         max-file: "10"
 
 
   statistics-service:
-    image: sqshq/piggymetrics-statistics-service
-    restart: always
     environment:
+      CONFIG_SERVICE_PASSWORD:
       STATISTICS_SERVICE_PASSWORD:
       MONGODB_PASSWORD:
+    image: sqshq/piggymetrics-statistics-mongodb
+    restart: always
     logging:
       options:
         max-size: "10m"
         max-file: "10"
 
   statistics-mongodb:
     build: mongodb
-    image: sqshq/piggymetrics-statistics-mongodb
-    restart: always
     environment:
       MONGODB_PASSWORD:
+    image: sqshq/piggymetrics-statistics-mongodb
+    restart: always
     logging:
       options:
         max-size: "10m"
         max-file: "10"
 
 
   notification-service:
-    image: sqshq/piggymetrics-notification-service
-    restart: always
     environment:
+      CONFIG_SERVICE_PASSWORD:
       STATISTICS_SERVICE_PASSWORD:
       MONGODB_PASSWORD:
+    image: sqshq/piggymetrics-notification-service
+    restart: always
     logging:
       options:
         max-size: "10m"

diff --git a/notification-service/Dockerfile b/notification-service/Dockerfile
@@ -2,6 +2,4 @@ FROM java:8-jre
 ADD ./target/notification-service.jar /app/
 CMD ["java", "-jar", "/app/notification-service.jar"]
 
-RUN java -jar /app/notification-service.jar
-
 EXPOSE 8888
diff --git a/notification-service/src/main/resources/bootstrap.yml b/notification-service/src/main/resources/bootstrap.yml
@@ -3,4 +3,7 @@ spring:
     name: notification-service
   cloud:
     config:
-      uri: http://config:8888
+      uri: http://config:8888
+      fail-fast: true
+      password: ${CONFIG_SERVICE_PASSWORD}
+      username: user