Commit a65e2afa authored by Noel Alonso's avatar Noel Alonso
Browse files

Merge branch 'dev' into 'master' 

Dev

See merge request redmic-project/server/oauth!16
parents 3cdefe2a eadcf4f5

pom.xml

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
	<modelVersion>4.0.0</modelVersion>

	<artifactId>oauth</artifactId>

	<packaging>jar</packaging>

	<version>0.8.0</version>

	<version>0.9.0</version>

	<name>OAuth</name>

	<description>Oauth authorization server</description>

src/main/java/es/redmic/oauth/config/CorsFilter.java

0 → 100644
+68 −0
Original line number Diff line number Diff line 
package es.redmic.oauth.config;



/*-

 * #%L

 * OAuth

 * %%

 * Copyright (C) 2019 REDMIC Project / Server

 * %%

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 * 

 *      http://www.apache.org/licenses/LICENSE-2.0

 * 

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 * #L%

 */



import java.io.IOException;



import javax.servlet.Filter;

import javax.servlet.FilterChain;

import javax.servlet.FilterConfig;

import javax.servlet.ServletException;

import javax.servlet.ServletRequest;

import javax.servlet.ServletResponse;

import javax.servlet.http.HttpServletRequest;

import javax.servlet.http.HttpServletResponse;



import org.springframework.core.Ordered;

import org.springframework.core.annotation.Order;

import org.springframework.stereotype.Component;



@Component

@Order(Ordered.HIGHEST_PRECEDENCE)

public class CorsFilter implements Filter {



	public CorsFilter() {

	}



	@Override

	public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain)

			throws IOException, ServletException {

		HttpServletResponse response = (HttpServletResponse) res;

		HttpServletRequest request = (HttpServletRequest) req;

		response.setHeader("Access-Control-Allow-Origin", "*");

		response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");

		response.setHeader("Access-Control-Allow-Headers", "x-requested-with, authorization");



		if ("OPTIONS".equalsIgnoreCase(request.getMethod())) {

			response.setStatus(HttpServletResponse.SC_OK);

		} else {

			chain.doFilter(req, res);

		}

	}



	@Override

	public void init(FilterConfig filterConfig) {

	}



	@Override

	public void destroy() {

	}

}

src/main/java/es/redmic/oauth/config/ResourceServerConfiguration.java

+2 −2
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ public class ResourceServerConfiguration extends ResourceServerConfigurerAdapter 
		authenticationEntryPoint.setRealmName("springsec/client");

		authenticationEntryPoint.setTypeName("Basic");



		// @formatter:on

		// @formatter:off



		http.anonymous().and().authorizeRequests().antMatchers(HttpMethod.GET, "/oauth/actuator/**").permitAll();
@@ -65,6 +65,6 @@ public class ResourceServerConfiguration extends ResourceServerConfigurerAdapter 


		http.requestMatchers().antMatchers("/**").and().sessionManagement()

				.sessionCreationPolicy(SessionCreationPolicy.STATELESS);

		// @formatter:off

		// @formatter:on

	}

}