Merge pull request eugenp#3444 from eugenp/BAEL-1177

lor6 · web-flow · commit 20551052e1c8 · 2018-01-18T12:15:34.000+02:00
refactor cloud security ex
diff --git a/spring-cloud/spring-cloud-security/authserver/pom.xml b/spring-cloud/spring-cloud-security/authserver/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>com.baeldung</groupId>
-	<artifactId>auth-server</artifactId>
+	<artifactId>authserver</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 
 
diff --git a/spring-cloud/spring-cloud-security/authserver/src/main/java/com/baeldung/AuthServer.java b/spring-cloud/spring-cloud-security/authserver/src/main/java/com/baeldung/AuthServer.java
@@ -1,15 +1,12 @@
-package com.cloudsecurity.auth;
+package com.baeldung;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.*;
 
-
 @SpringBootApplication
 public class AuthServer {
 
     public static void main(String[] args) {
-        // TODO Auto-generated method stub
-        SpringApplication.run(
-           AuthServer.class, args);
+        SpringApplication.run(AuthServer.class, args);
     }
 }
diff --git a/spring-cloud/spring-cloud-security/authserver/src/main/java/com/baeldung/config/AuthServerConfigurer.java b/spring-cloud/spring-cloud-security/authserver/src/main/java/com/baeldung/config/AuthServerConfigurer.java
@@ -1,4 +1,4 @@
-package com.cloudsecurity.auth.config;
+package com.baeldung.config;
 
 import java.security.KeyPair;
 
diff --git a/spring-cloud/spring-cloud-security/authserver/src/main/java/com/baeldung/config/ResourceServerConfigurer.java b/spring-cloud/spring-cloud-security/authserver/src/main/java/com/baeldung/config/ResourceServerConfigurer.java
@@ -1,4 +1,4 @@
-package com.cloudsecurity.auth.config;
+package com.baeldung.config;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
@@ -11,9 +11,6 @@
 @Configuration
 @EnableResourceServer
 public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
-
-
-    
     @Override
     public void configure(HttpSecurity http) throws Exception {
         http.antMatcher("/user")
diff --git a/spring-cloud/spring-cloud-security/authserver/src/main/java/com/baeldung/config/WebMvcConfigurer.java b/spring-cloud/spring-cloud-security/authserver/src/main/java/com/baeldung/config/WebMvcConfigurer.java
@@ -1,15 +1,14 @@
-package com.cloudsecurity.auth.config;
+package com.baeldung.config;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
 
-
 @Configuration
 public class WebMvcConfigurer extends WebMvcConfigurerAdapter {
 
     @Override
     public void addViewControllers(ViewControllerRegistry registry) {
         registry.addViewController("login").setViewName("login");
     }
-}
+}
diff --git a/spring-cloud/spring-cloud-security/authserver/src/main/java/com/baeldung/config/WebSecurityConfigurer.java b/spring-cloud/spring-cloud-security/authserver/src/main/java/com/baeldung/config/WebSecurityConfigurer.java
@@ -1,6 +1,5 @@
-package com.cloudsecurity.auth.config;
+package com.baeldung.config;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
@@ -9,7 +8,6 @@
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 
 import org.springframework.security.core.userdetails.UserDetailsService;
-import org.springframework.security.oauth2.client.OAuth2ClientContext;
 import org.springframework.security.oauth2.config.annotation.web.configuration.EnableOAuth2Client;
 
 @Configuration
diff --git a/spring-cloud/spring-cloud-security/authserver/src/main/java/com/baeldung/controller/ResourceController.java b/spring-cloud/spring-cloud-security/authserver/src/main/java/com/baeldung/controller/ResourceController.java
@@ -1,4 +1,4 @@
-package com.cloudsecurity.auth.controller;
+package com.baeldung.controller;
 
 import java.security.Principal;
 import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/spring-cloud/spring-cloud-security/oauth2client/pom.xml b/spring-cloud/spring-cloud-security/oauth2client/pom.xml
@@ -2,18 +2,18 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>com.example</groupId>
-	<artifactId>springoath2</artifactId>
+	<groupId>com.baeldung</groupId>
+	<artifactId>oauth2client</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
-	<name>springoath2</name>
+	<name>oauth2client</name>
 	<description>Demo project for Spring Boot</description>
 
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.5.8.RELEASE</version>
+		<version>1.5.9.RELEASE</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 
diff --git a/spring-cloud/spring-cloud-security/oauth2client/src/main/java/com/baeldung/CloudSite.java b/spring-cloud/spring-cloud-security/oauth2client/src/main/java/com/baeldung/CloudSite.java
@@ -1,20 +1,18 @@
-package com.cloud.springwebsite;
+package com.baeldung;
 
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.netflix.zuul.EnableZuulProxy;
 import org.springframework.context.annotation.Bean;
 
-import com.cloudsite.filters.pre.SimpleFilter;
+import com.baeldung.filters.SimpleFilter;
 
 
 @SpringBootApplication
 public class CloudSite {
     public static void main(String[] args) {
         SpringApplication.run(CloudSite.class, args);
-    }
-    
+    }    
     
     @Bean
     public SimpleFilter simpleFilter() {
diff --git a/spring-cloud/spring-cloud-security/oauth2client/src/main/java/com/baeldung/config/SiteSecurityConfigurer.java b/spring-cloud/spring-cloud-security/oauth2client/src/main/java/com/baeldung/config/SiteSecurityConfigurer.java
@@ -1,4 +1,4 @@
-package com.cloud.springwebsite.config;
+package com.baeldung.config;
 
 import org.springframework.boot.autoconfigure.security.oauth2.client.EnableOAuth2Sso;
 import org.springframework.cloud.netflix.zuul.EnableZuulProxy;
diff --git a/spring-cloud/spring-cloud-security/oauth2client/src/main/java/com/baeldung/controller/CloudSiteController.java b/spring-cloud/spring-cloud-security/oauth2client/src/main/java/com/baeldung/controller/CloudSiteController.java
@@ -1,39 +1,30 @@
-package com.cloud.springwebsite.controller;
-
-import java.net.URI;
+package com.baeldung.controller;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.client.RestOperations;
 import org.springframework.web.servlet.ModelAndView;
 
 @RestController
 public class CloudSiteController {
-    
+
     @Autowired
     private RestOperations restOperations;
 
-    
-    @Value("${person.url}")
-    private String personUrl;
-    
-     
-    @RequestMapping("/")
+    @GetMapping("/")
     @ResponseBody
     public String helloFromBaeldung() {
         return "Hello From Baeldung!";
     }
 
-    
-    @RequestMapping("/person")
-    public ModelAndView person(){
+    @GetMapping("/person")
+    public ModelAndView person() {
         ModelAndView mav = new ModelAndView("personinfo");
-        mav.addObject("person",restOperations.getForObject(personUrl, String.class));        
-        return mav;    
+        String personResourceUrl = "http://localhost:9000/personResource";
+        mav.addObject("person", restOperations.getForObject(personResourceUrl, String.class));
+        return mav;
     }
-      
+
 }
diff --git a/spring-cloud/spring-cloud-security/oauth2client/src/main/java/com/baeldung/filters/SimpleFilter.java b/spring-cloud/spring-cloud-security/oauth2client/src/main/java/com/baeldung/filters/SimpleFilter.java
@@ -0,0 +1,39 @@
+package com.baeldung.filters;
+
+import javax.servlet.http.HttpServletRequest;
+import com.netflix.zuul.context.RequestContext;
+import com.netflix.zuul.ZuulFilter;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class SimpleFilter extends ZuulFilter {
+
+    private static Logger log = LoggerFactory.getLogger(SimpleFilter.class);
+
+    @Override
+    public String filterType() {
+        return "pre";
+    }
+
+    @Override
+    public int filterOrder() {
+        return 1;
+    }
+
+    @Override
+    public boolean shouldFilter() {
+        return true;
+    }
+
+    @Override
+    public Object run() {
+        RequestContext ctx = RequestContext.getCurrentContext();
+        HttpServletRequest request = ctx.getRequest();
+
+        log.info(String.format("%s request to %s", request.getMethod(), request.getRequestURL().toString()));
+
+        return null;
+    }
+
+}
diff --git a/spring-cloud/spring-cloud-security/oauth2client/src/main/resources/application.properties b/spring-cloud/spring-cloud-security/oauth2client/src/main/resources/application.properties
diff --git a/spring-cloud/spring-cloud-security/oauth2client/src/main/resources/application.yml b/spring-cloud/spring-cloud-security/oauth2client/src/main/resources/application.yml
diff --git a/spring-cloud/spring-cloud-security/oauth2client/src/main/resources/templates/personinfo.html b/spring-cloud/spring-cloud-security/oauth2client/src/main/resources/templates/personinfo.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html lang="en" xmlns:th="http://www.thymeleaf.org">
+<head>
+<meta charset="UTF-8" />
+<title>Getting Personal Information</title>
+</head>
+<body>
+	<h1>Providing Person Information</h1>
+	<p>
+		Person's information: <span id="personInfo" th:text="${person}"></span>
+	</p>
+</body>
+</html>
diff --git a/spring-cloud/spring-cloud-security/oauth2client/src/test/java/com/example/springoath2/Springoath2ApplicationTests.java b/spring-cloud/spring-cloud-security/oauth2client/src/test/java/com/example/springoath2/Springoath2ApplicationTests.java
diff --git a/spring-cloud/spring-cloud-security/personresource/pom.xml b/spring-cloud/spring-cloud-security/personresource/pom.xml
@@ -3,18 +3,18 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
-	<groupId>com.baeldung.service</groupId>
-	<artifactId>personservice</artifactId>
+	<groupId>com.baeldung</groupId>
+	<artifactId>personresource</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
-	<name>personservice</name>
+	<name>personresource</name>
 	<description>Demo project for Spring Boot</description>
 
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.5.8.RELEASE</version>
+		<version>1.5.9.RELEASE</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 
diff --git a/spring-cloud/spring-cloud-security/personresource/src/main/java/com/baeldung/Application.java b/spring-cloud/spring-cloud-security/personresource/src/main/java/com/baeldung/Application.java
@@ -1,12 +1,12 @@
-package com.baeldung.service.personservice;
+package com.baeldung;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
-public class PersonserviceApplication {
+public class Application {
 
     public static void main(String[] args) {
-        SpringApplication.run(PersonserviceApplication.class, args);
+        SpringApplication.run(Application.class, args);
     }
 }
diff --git a/spring-cloud/spring-cloud-security/personresource/src/main/java/com/baeldung/config/ResourceConfigurer.java b/spring-cloud/spring-cloud-security/personresource/src/main/java/com/baeldung/config/ResourceConfigurer.java
@@ -1,4 +1,4 @@
-package com.baeldung.service.personservice.config;
+package com.baeldung.config;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
@@ -21,5 +21,5 @@ public void configure(HttpSecurity http) throws Exception {
         http.httpBasic().disable();
         http.authorizeRequests().anyRequest().authenticated();
     }
-       
+
 }
diff --git a/spring-cloud/spring-cloud-security/personresource/src/main/java/com/baeldung/controller/PersonInfoController.java b/spring-cloud/spring-cloud-security/personresource/src/main/java/com/baeldung/controller/PersonInfoController.java
@@ -0,0 +1,21 @@
+package com.baeldung.controller;
+
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.baeldung.model.Person;
+import com.google.gson.Gson;
+
+@RestController
+public class PersonInfoController {
+
+    @GetMapping("/personResource")
+    @PreAuthorize("hasAnyRole('ADMIN', 'USER')")
+    public @ResponseBody String personInfo() {
+        Gson gson = new Gson();
+        String person = gson.toJson(new Person("abir", "Dhaka", "Bangladesh", 29, "Male"));
+        return person;
+    }
+}
diff --git a/spring-cloud/spring-cloud-security/personresource/src/main/java/com/baeldung/model/Person.java b/spring-cloud/spring-cloud-security/personresource/src/main/java/com/baeldung/model/Person.java
@@ -1,51 +1,59 @@
-package com.baeldung.service.model;
+package com.baeldung.model;
 
 public class Person {
-    
+
     private String name;
     private String city;
     private String country;
     private Integer age;
     private String sex;
-    
-    public Person(String name, String city, String country, Integer age, String sex){
+
+    public Person(String name, String city, String country, Integer age, String sex) {
         this.name = name;
         this.city = city;
         this.country = country;
         this.age = age;
         this.sex = sex;
     }
-    
-    
+
     public String getName() {
         return name;
     }
+
     public void setName(String name) {
         this.name = name;
     }
+
     public String getCity() {
         return city;
     }
+
     public void setCity(String city) {
         this.city = city;
     }
+
     public String getCountry() {
         return country;
     }
+
     public void setCountry(String country) {
         this.country = country;
     }
+
     public Integer getAge() {
         return age;
     }
+
     public void setAge(Integer age) {
         this.age = age;
     }
+
     public String getSex() {
         return sex;
     }
+
     public void setSex(String sex) {
         this.sex = sex;
     }
-   
+
 }
diff --git a/spring-cloud/spring-cloud-security/personresource/src/main/resources/application.yml b/spring-cloud/spring-cloud-security/personresource/src/main/resources/application.yml
diff --git a/spring-cloud/spring-cloud-security/personresource/src/test/java/com/baeldung/service/personservice/PersonserviceApplicationTests.java b/spring-cloud/spring-cloud-security/personresource/src/test/java/com/baeldung/service/personservice/PersonserviceApplicationTests.java
diff --git a/spring-cloud/spring-cloud-security/personservice/src/main/java/com/baeldung/service/personservice/controller/PersonInfoController.java b/spring-cloud/spring-cloud-security/personservice/src/main/java/com/baeldung/service/personservice/controller/PersonInfoController.java
diff --git a/spring-cloud/spring-cloud-security/springoath2client/src/main/java/com/cloudsite/filters/pre/SimpleFilter.java b/spring-cloud/spring-cloud-security/springoath2client/src/main/java/com/cloudsite/filters/pre/SimpleFilter.java
diff --git a/spring-cloud/spring-cloud-security/springoath2client/src/main/resources/application.properties b/spring-cloud/spring-cloud-security/springoath2client/src/main/resources/application.properties
diff --git a/spring-cloud/spring-cloud-security/springoath2client/src/main/resources/templates/personinfo.html b/spring-cloud/spring-cloud-security/springoath2client/src/main/resources/templates/personinfo.html

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.cloudsecurity.auth.config;`
	`1`	`+package com.baeldung.config;`
`2`	`2`
`3`	`3`	`import java.security.KeyPair;`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.cloudsecurity.auth.controller;`
	`1`	`+package com.baeldung.controller;`
`2`	`2`
`3`	`3`	`import java.security.Principal;`
`4`	`4`	`import org.springframework.web.bind.annotation.RequestMapping;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.cloud.springwebsite.config;`
	`1`	`+package com.baeldung.config;`
`2`	`2`
`3`	`3`	`import org.springframework.boot.autoconfigure.security.oauth2.client.EnableOAuth2Sso;`
`4`	`4`	`import org.springframework.cloud.netflix.zuul.EnableZuulProxy;`