Commit 995b50ef authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Corrige nombre de imagen de deploy

See merge request redmic-project/server/oauth!1
parents dd5399ac fc53d3b5

.gitlab-ci.yml

+58 −25
Original line number Diff line number Diff line
@@ -6,32 +6,36 @@ stages: 


maven-build:

  stage: build

  image: redmic/maven-gitlab

  image: registry.gitlab.com/redmic-project/docker/maven

  variables:

    MAVEN_OPTS: -Dmaven.repo.local=.m2/repository

    SPRING_PROFILES_ACTIVE: test

    MAVEN_OPTS: "-Dmaven.repo.local=.m2/repository -Dspring.datasource.username=${DEV_SPRING_DATASOURCE_USERNAME} -Dspring.datasource.password=${DEV_SPRING_DATASOURCE_PASSWORD}"

    SPRING_DATASOURCE_USERNAME: ${DEV_SPRING_DATASOURCE_USERNAME}

    SPRING_DATASOURCE_PASSWORD: ${DEV_SPRING_DATASOURCE_PASSWORD}

  only:

    - branches

  cache:

    paths:

      - .m2/repository/

  script:

    - mvn verify ${MAVEN_OPTS} spring-boot:repackage -B ${MAVEN_OPTS}

    - mvn verify spring-boot:repackage -B

    - "COVERAGE=$(xmllint --html --xpath '//table[@id=\"coveragetable\"]/tfoot//td[@class=\"ctr2\"][1]/text()' target/site/jacoco/index.html)"

    - 'echo "Coverage: ${COVERAGE}"'

  after_script:

    - rm -r .m2/repository/es

  artifacts:

    name: "${CI_PROJECT_NAME}"

    name: "${CI_PROJECT_NAME}-${CI_COMMIT_REF_NAME}"

    expire_in: '6 months'

    paths:

      - dist/*.jar



docker-build-commit:

docker-build-commit-non-master-branches:

  stage: package

  image: redmic/docker-gitlab

  image: docker:stable

  variables:

    DOCKER_DRIVER: overlay2

    PARENT_IMAGE_NAME: registry.gitlab.com/redmic-project/docker/redmic-server

    PARENT_IMAGE_TAG: latest

  services:

    - docker:dind

  only:
@@ -40,12 +44,32 @@ docker-build-commit: 
    - master

  script:

    - docker login -u gitlab-ci-token -p ${CI_JOB_TOKEN} ${CI_REGISTRY}

    - docker build -t ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA} -t ${CI_REGISTRY_IMAGE}:${CI_COMMIT_REF_NAME}-latest .

    - >

      docker build --build-arg PARENT_IMAGE_NAME=${PARENT_IMAGE_NAME} --build-arg PARENT_IMAGE_TAG=${PARENT_IMAGE_TAG}

      -t ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA} -t ${CI_REGISTRY_IMAGE}:${CI_COMMIT_REF_NAME}-latest .

    - docker push ${CI_REGISTRY_IMAGE}



docker-build-tag:

docker-build-commit-master-branch:

  stage: package

  image: redmic/docker-gitlab

  image: docker:stable

  variables:

    DOCKER_DRIVER: overlay2

    PARENT_IMAGE_NAME: registry.gitlab.com/redmic-project/docker/redmic-server

    PARENT_IMAGE_TAG: latest

  services:

    - docker:dind

  only:

    - master

  script:

    - docker login -u gitlab-ci-token -p ${CI_JOB_TOKEN} ${CI_REGISTRY}

    - >

      docker build --build-arg PARENT_IMAGE_NAME=${PARENT_IMAGE_NAME} --build-arg PARENT_IMAGE_TAG=${PARENT_IMAGE_TAG}

      -t ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA} -t ${CI_REGISTRY_IMAGE}:latest .

    - docker push ${CI_REGISTRY_IMAGE}



docker-tag-already-built-image:

  stage: package

  image: docker:stable

  variables:

    DOCKER_DRIVER: overlay2

  services:
@@ -54,10 +78,10 @@ docker-build-tag: 
    - tags

  script:

    - docker login -u gitlab-ci-token -p ${CI_JOB_TOKEN} ${CI_REGISTRY}

    - docker build -t ${CI_REGISTRY_IMAGE}:${CI_COMMIT_TAG} -t ${CI_REGISTRY_IMAGE}:latest .

    - docker tag ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA} ${CI_REGISTRY_IMAGE}:${CI_COMMIT_TAG}

    - docker push ${CI_REGISTRY_IMAGE}



container_scanning:

container-scanning:

  stage: test-package

  image: docker:stable

  variables:
@@ -67,8 +91,6 @@ container_scanning: 
    - docker:stable-dind

  only:

    - branches

  except:

    - master

  script:

    - docker run -d --name db arminc/clair-db:latest

    - docker run -p 6060:6060 --link db:postgres -d --name clair arminc/clair-local-scan:v2.0.1
@@ -79,24 +101,29 @@ container_scanning: 
    - mv clair-scanner_linux_amd64 clair-scanner

    - chmod +x clair-scanner

    - touch clair-whitelist.yml

    - ./clair-scanner -c http://docker:6060 --ip $(hostname -i) -r gl-sast-container-report.json -l clair.log -w clair-whitelist.yml ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA} || true

    - >

      ./clair-scanner -c http://docker:6060 --ip $(hostname -i) -r gl-sast-container-report.json -l clair.log

      -w clair-whitelist.yml ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA} || true

  artifacts:

    paths: [gl-sast-container-report.json]



deploy-dev:

  stage: deploy

  image: redmic/docker-gitlab

  image: registry.gitlab.com/redmic-project/docker/docker-deploy

  variables:

    DOCKER_DRIVER: overlay2

    SSH_REMOTE: ${DEV_SSH_REMOTE}

    SERVICE: ${CI_PROJECT_NAME}

    IMAGE_NAME: ${DOCKER_ENV_CI_REGISTRY_IMAGE}

    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml

  services:

    - docker:dind

  script:

    - deploy.sh SPRING_PROFILES_ACTIVE=pre IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} SPRING_DATASOURCE_USERNAME=${DEV_SPRING_DATASOURCE_USERNAME} SPRING_DATASOURCE_PASSWORD=${DEV_SPRING_DATASOURCE_PASSWORD}

    - >

      deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}

      SPRING_PROFILES_ACTIVE=pre SPRING_DATASOURCE_USERNAME=${DEV_SPRING_DATASOURCE_USERNAME}

      SPRING_DATASOURCE_PASSWORD=${DEV_SPRING_DATASOURCE_PASSWORD}

  environment:

    name: dev

    url: https://appdev.${DEV_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}
@@ -105,18 +132,21 @@ deploy-dev: 


deploy-supporting-branch:

  stage: deploy

  image: redmic/docker-gitlab

  image: registry.gitlab.com/redmic-project/docker/docker-deploy

  variables:

    DOCKER_DRIVER: overlay2

    SSH_REMOTE: ${DEV_SSH_REMOTE}

    SERVICE: ${CI_PROJECT_NAME}

    IMAGE_NAME: ${DOCKER_ENV_CI_REGISTRY_IMAGE}

    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml

  services:

    - docker:dind

  script:

    - deploy.sh SPRING_PROFILES_ACTIVE=pre IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} SPRING_DATASOURCE_USERNAME=${DEV_SPRING_DATASOURCE_USERNAME} SPRING_DATASOURCE_PASSWORD=${DEV_SPRING_DATASOURCE_PASSWORD}

    - >

      deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}

      SPRING_PROFILES_ACTIVE=pre SPRING_DATASOURCE_USERNAME=${DEV_SPRING_DATASOURCE_USERNAME}

      SPRING_DATASOURCE_PASSWORD=${DEV_SPRING_DATASOURCE_PASSWORD}

  environment:

    name: dev

    url: https://appdev.${DEV_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}
@@ -129,21 +159,24 @@ deploy-supporting-branch: 


deploy-pro:

  stage: deploy

  image: redmic/docker-gitlab

  image: registry.gitlab.com/redmic-project/docker/docker-deploy

  variables:

    DOCKER_DRIVER: overlay2

    SSH_REMOTE: ${PRO_SSH_REMOTE}

    SERVICE: ${CI_PROJECT_NAME}

    IMAGE_NAME: ${DOCKER_ENV_CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_TAG}

    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.prod.yml

  services:

    - docker:dind

  script:

    - deploy.sh SPRING_PROFILES_ACTIVE=prod IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} SPRING_DATASOURCE_USERNAME=${PRO_SPRING_DATASOURCE_USERNAME} SPRING_DATASOURCE_PASSWORD=${PRO_SPRING_DATASOURCE_PASSWORD}

    - >

      deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}

      SPRING_PROFILES_ACTIVE=prod SPRING_DATASOURCE_USERNAME=${PRO_SPRING_DATASOURCE_USERNAME}

      SPRING_DATASOURCE_PASSWORD=${PRO_SPRING_DATASOURCE_PASSWORD}

  environment:

    name: pro

    url: https://${PRO_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}

  only:

    - tags

    - master

  when: manual

Dockerfile

+7 −7
Original line number Diff line number Diff line 
FROM redmic/redmic-server

ARG PARENT_IMAGE_NAME

ARG PARENT_IMAGE_TAG



FROM ${PARENT_IMAGE_NAME}:${PARENT_IMAGE_TAG}



COPY /dist/*.jar ./



EXPOSE 8081

EXPOSE ${MICROSERVICE_PORT}



ENTRYPOINT java $JAVA_OPTS \

ENTRYPOINT java ${JAVA_OPTS} \

	-Djava.security.egd=file:/dev/./urandom \

	-Dlogging.level.org.springframework=${LOG_LEVEL} \

	-Dspring.datasource.username=${SPRING_DATASOURCE_USERNAME} \

	-Dspring.datasource.password=${SPRING_DATASOURCE_PASSWORD} \

	-jar ${DIRPATH}/oauth.jar
 
	-jar ${DIRPATH}/${MICROSERVICE_NAME}.jar

docker-compose.tmpl.yml

+2 −0
Original line number Diff line number Diff line
@@ -4,6 +4,8 @@ services: 
  oauth:

    image: ${IMAGE_NAME}:${IMAGE_TAG:-latest}

    environment:

      - MICROSERVICE_NAME

      - MICROSERVICE_PORT

      - SPRING_PROFILES_ACTIVE

      - SPRING_DATASOURCE_USERNAME

      - SPRING_DATASOURCE_PASSWORD

pom.xml

+73 −14
Original line number Diff line number Diff line
@@ -2,30 +2,53 @@ 
<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">

	

	<parent>

		<groupId>es.redmic</groupId>

		<artifactId>redmic</artifactId>

		<version>0.6.0</version>

		<groupId>org.springframework.boot</groupId>

		<artifactId>spring-boot-starter-parent</artifactId>

		<version>2.0.0.RELEASE</version>

		<relativePath />

	</parent>



	<modelVersion>4.0.0</modelVersion>

	<groupId>es.redmic</groupId>

	<artifactId>oauth</artifactId>

	<packaging>jar</packaging>

	<version>0.6.0</version>

	<name>OAuth</name>

	<description>Oauth server</description>

	<description>Oauth authorization server</description>

	

	<properties>

		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

		<maven.compiler.source>1.8</maven.compiler.source>

		<maven.compiler.target>1.8</maven.compiler.target>

		<java.version>1.8</java.version>

		<tomcat.version>8.5.28</tomcat.version>



		<!-- REDMIC -->

		<redmic.db-commons.version>0.6.0</redmic.db-commons.version>

		<redmic.exceptions.version>0.6.0</redmic.exceptions.version>



		<!-- Plugins -->

		<jacoco.version>0.8.1</jacoco.version>

		

		<!-- Environment variables -->

		<env.MAVEN_REPO_URL>https://artifactory.redmic.net/artifactory</env.MAVEN_REPO_URL>

	</properties>



	<dependencies>

		<!-- Redmic -->

		<dependency>

			<groupId>es.redmic.lib</groupId>

			<artifactId>db-commons</artifactId>

			<version>${redmic.version}</version>

			<version>${redmic.db-commons.version}</version>

		</dependency>



		<dependency>

			<groupId>es.redmic.lib</groupId>

			<artifactId>exceptions</artifactId>

			<version>${redmic.version}</version>

			<version>${redmic.exceptions.version}</version>

		</dependency>



		<!-- Spring -->
@@ -59,6 +82,17 @@ 
		    <artifactId>micrometer-registry-prometheus</artifactId>

		</dependency>

		

		<!-- Logs -->

		<dependency>

			<groupId>org.apache.logging.log4j</groupId>

			<artifactId>log4j-api</artifactId>

		</dependency>

		

		<dependency>

			<groupId>org.apache.logging.log4j</groupId>

			<artifactId>log4j-core</artifactId>

		</dependency>



		<!-- tests -->



		<dependency>
@@ -67,16 +101,21 @@ 
			<scope>test</scope>

		</dependency>

	</dependencies>



	<distributionManagement>

		<repository>

			<id>central</id>

			<name>redmic-releases</name>

			<url>${env.MAVEN_REPO_URL}/libs-release-local</url>

		</repository>

		<snapshotRepository>

			<id>snapshots</id>

			<name>redmic-snapshots</name>

			<url>${env.MAVEN_REPO_URL}/libs-snapshot-local</url>

			<uniqueVersion>false</uniqueVersion>

		</snapshotRepository>

	</distributionManagement>

	<build>

		<plugins>

			<plugin>

				<groupId>org.apache.maven.plugins</groupId>

				<artifactId>maven-install-plugin</artifactId>

				<configuration>

					<skip>true</skip>

				</configuration>

			</plugin>

			<plugin>

				<groupId>org.springframework.boot</groupId>

				<artifactId>spring-boot-maven-plugin</artifactId>
@@ -93,6 +132,26 @@ 
					</execution>

				</executions>

			</plugin>

			<plugin>

				<groupId>org.jacoco</groupId>

				<artifactId>jacoco-maven-plugin</artifactId>

				<version>${jacoco.version}</version>

				<executions>

					<execution>

						<id>pre-unit-test</id>

						<goals>

							<goal>prepare-agent</goal>

						</goals>

					</execution>

					<execution>

						<id>post-unit-test</id>

						<phase>test</phase>

						<goals>

							<goal>report</goal>

						</goals>

					</execution>

				</executions>

			</plugin>

		</plugins>

	</build>

</project>

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

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



import javax.sql.DataSource;



import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.beans.factory.annotation.Qualifier;

import org.springframework.context.annotation.Bean;

import org.springframework.context.annotation.Configuration;

import org.springframework.context.annotation.Primary;

import org.springframework.security.authentication.AuthenticationManager;

import org.springframework.security.oauth2.config.annotation.configurers.ClientDetailsServiceConfigurer;

import org.springframework.security.oauth2.config.annotation.web.configuration.AuthorizationServerConfigurerAdapter;

import org.springframework.security.oauth2.config.annotation.web.configuration.EnableAuthorizationServer;

import org.springframework.security.oauth2.config.annotation.web.configurers.AuthorizationServerEndpointsConfigurer;

import org.springframework.security.oauth2.config.annotation.web.configurers.AuthorizationServerSecurityConfigurer;

import org.springframework.security.oauth2.provider.token.DefaultTokenServices;

import org.springframework.security.oauth2.provider.token.store.JdbcTokenStore;



import es.redmic.oauth.security.service.ClientDetailsSeviceImpl;

import es.redmic.oauth.security.service.UserDetailsServiceImpl;



@Configuration

@EnableAuthorizationServer

public class AuthorizationServerConfiguration extends AuthorizationServerConfigurerAdapter {



	@Autowired

	DataSource dataSource;



	@Bean(name = "tokenStore")

	public JdbcTokenStore tokenStore() {

		return new JdbcTokenStore(dataSource);

	}



	@Autowired

	private UserDetailsServiceImpl userDetailsService;



	@Autowired

	private ClientDetailsSeviceImpl clientDetailsService;



	@Autowired

	@Qualifier("authenticationManagerBean")

	private AuthenticationManager authenticationManager;



	@Override

	public void configure(AuthorizationServerSecurityConfigurer security) throws Exception {



		security.checkTokenAccess("isAuthenticated()");

	}



	@Override

	public void configure(AuthorizationServerEndpointsConfigurer endpoints) throws Exception {

		// @formatter:off

		endpoints.tokenStore(tokenStore()).authenticationManager(this.authenticationManager)

				.userDetailsService(userDetailsService);

		// @formatter:on

	}



	@Override

	public void configure(ClientDetailsServiceConfigurer clients) throws Exception {

		// @formatter:off

		clients.withClientDetails(clientDetailsService);

		// @formatter:on

	}



	@Bean

	@Primary

	public DefaultTokenServices tokenServices() {

		DefaultTokenServices tokenServices = new DefaultTokenServices();

		tokenServices.setSupportRefreshToken(true);

		tokenServices.setTokenStore(tokenStore());

		return tokenServices;

	}

}