Merge branch 'master' into BAEL-16646-2

spring-cloud/spring-cloud-security/auth-client/pom.xml

@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+    <artifactId>auth-client</artifactId>
+    <name>auth-client</name>
+    <packaging>jar</packaging>
+    <description>Spring Cloud Security APP Client Module</description>
+
+    <parent>
+        <artifactId>spring-cloud-security</artifactId>
+        <groupId>com.baeldung</groupId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-dependencies</artifactId>
+                <version>${spring-cloud.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-oauth2</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-netflix-zuul</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.webjars</groupId>
+            <artifactId>jquery</artifactId>
+            <version>${jquery.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.webjars</groupId>
+            <artifactId>bootstrap</artifactId>
+            <version>${bootstrap.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.webjars</groupId>
+            <artifactId>webjars-locator-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.webjars</groupId>
+            <artifactId>js-cookie</artifactId>
+            <version>${js-cookie.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-thymeleaf</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.security.oauth.boot</groupId>
+            <artifactId>spring-security-oauth2-autoconfigure</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+    <properties>
+        <js-cookie.version>2.2.0</js-cookie.version>
+        <spring-cloud.version>Greenwich.SR1</spring-cloud.version>
+        <jquery.version>3.4.1</jquery.version>
+        <bootstrap.version>4.3.1</bootstrap.version>
+    </properties>
+
+</project>

spring-cloud/spring-cloud-security/auth-client/src/main/java/com/baeldung/CloudSite.java

@@ -0,0 +1,22 @@
+package com.baeldung;
+
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Bean;
+
+import com.baeldung.filters.SimpleFilter;
+
+
+@SpringBootApplication
+public class CloudSite {
+    public static void main(String[] args) {
+        SpringApplication.run(CloudSite.class, args);
+    }    
+    
+    @Bean
+    public SimpleFilter simpleFilter() {
+      return new SimpleFilter();
+    } 
+    
+}

spring-cloud/spring-cloud-security/auth-client/src/main/java/com/baeldung/config/SiteSecurityConfigurer.java

@@ -0,0 +1,49 @@
+package com.baeldung.config;
+
+import org.springframework.boot.autoconfigure.security.oauth2.client.EnableOAuth2Sso;
+import org.springframework.cloud.netflix.zuul.EnableZuulProxy;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+import org.springframework.security.oauth2.client.OAuth2ClientContext;
+import org.springframework.security.oauth2.client.OAuth2RestOperations;
+import org.springframework.security.oauth2.client.OAuth2RestTemplate;
+import org.springframework.security.oauth2.client.resource.OAuth2ProtectedResourceDetails;
+import org.springframework.security.web.csrf.CookieCsrfTokenRepository;
+
+@EnableZuulProxy
+@Configuration
+@EnableOAuth2Sso
+public class SiteSecurityConfigurer
+    extends
+        WebSecurityConfigurerAdapter {
+
+    @Override
+    protected void configure(HttpSecurity http)
+        throws Exception {
+        http.antMatcher("/**")
+            .authorizeRequests()
+            .antMatchers("/", "/webjars/**")
+            .permitAll()
+            .anyRequest()
+            .authenticated()
+            .and()
+            .logout()
+            .logoutSuccessUrl("/")
+            .permitAll()
+            .and()
+            .csrf()
+            .csrfTokenRepository(
+                CookieCsrfTokenRepository
+                    .withHttpOnlyFalse());
+    }
+
+    @Bean
+    public OAuth2RestOperations restOperations(
+        OAuth2ProtectedResourceDetails resource,
+        OAuth2ClientContext context) {
+        return new OAuth2RestTemplate(resource, context);
+    }
+
+}

spring-cloud/spring-cloud-security/auth-client/src/main/java/com/baeldung/controller/CloudSiteController.java

@@ -0,0 +1,30 @@
+package com.baeldung.controller;
+
+import org.springframework.beans.factory.annotation.Autowired;
+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;
+
+    @GetMapping("/")
+    @ResponseBody
+    public String helloFromBaeldung() {
+        return "Hello From Baeldung!";
+    }
+
+    @GetMapping("/personInfo")
+    public ModelAndView person() {
+        ModelAndView mav = new ModelAndView("personinfo");
+        String personResourceUrl = "http://localhost:9000/person";
+        mav.addObject("person", restOperations.getForObject(personResourceUrl, String.class));
+        return mav;
+    }
+
+}

spring-cloud/spring-cloud-security/auth-client/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;
+    }
+
+}

spring-cloud/spring-cloud-security/auth-client/src/main/resources/application.yml

@@ -0,0 +1,39 @@
+# Make the application available at http://localhost:8080
+# These are default settings, but we add them for clarity.
+server:
+  port: 8080
+  servlet:
+    context-path: /
+
+# Configure the Authorization Server and User Info Resource Server details
+security:
+  oauth2:
+    client:
+      accessTokenUri: http://localhost:7070/authserver/oauth/token
+      userAuthorizationUri: http://localhost:7070/authserver/oauth/authorize
+      clientId: authserver
+      clientSecret: passwordforauthserver
+    resource:
+      userInfoUri: http://localhost:9000/user
+
+person:
+  url: http://localhost:9000/person
+
+# Proxies the calls to http://localhost:8080/api/* to our REST service at http://localhost:8081/*
+# and automatically includes our OAuth2 token in the request headers
+zuul:
+  sensitiveHeaders: Cookie,Set-Cookie  
+  routes:
+    resource:
+      path: /api/**
+      url: http://localhost:9000
+    user: 
+      path: /user/**
+      url: http://localhost:9000/user
+
+# Make sure the OAuth2 token is only relayed when using the internal API,
+# do not pass any authentication to the external API
+proxy:
+  auth:
+    routes:
+      api: oauth2

spring-cloud/spring-cloud-security/auth-client/src/main/resources/logback.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
+            </pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>

spring-cloud/spring-cloud-security/auth-client/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>

spring-cloud/spring-cloud-security/auth-client/src/test/java/com/example/springoath2/Springoath2ApplicationIntegrationTest.java

@@ -0,0 +1,18 @@
+package com.example.springoath2;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.CloudSite;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = CloudSite.class)
+public class Springoath2ApplicationIntegrationTest {
+
+	@Test
+	public void contextLoads() {
+	}
+
+}

spring-cloud/spring-cloud-security/auth-client/src/test/java/org/baeldung/SpringContextIntegrationTest.java

@@ -0,0 +1,18 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.CloudSite;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = CloudSite.class)
+public class SpringContextIntegrationTest {
+
+	@Test
+	public void contextLoads() {
+	}
+
+}

spring-cloud/spring-cloud-security/auth-client/src/test/java/org/baeldung/SpringContextTest.java

@@ -0,0 +1,18 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.CloudSite;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = CloudSite.class)
+public class SpringContextTest {
+
+	@Test
+	public void contextLoads() {
+	}
+
+}