Not Secured healtcheck

https://jira.onap.org/browse/DCAEGEN2-1539

Issue-ID: DCAEGEN2-1539
Change-Id: I55c9387e64a5a6b710785ecbfa695683d821599a
Signed-off-by: Zlatko Murgoski <zlatko.murgoski@nokia.com>

diff --git a/dpo/blueprint/blueprint_ves.yaml b/dpo/blueprint/blueprint_ves.yaml
index 43158f1..f373acf 100644 (file)
--- a/dpo/blueprint/blueprint_ves.yaml
+++ b/dpo/blueprint/blueprint_ves.yaml
@@ -242,7 +242,7 @@ node_templates:
       docker_config:
         interval: 15s
         timeout: 1s
-        type: https
+        type: http
         endpoint: /healthcheck
       image:
         get_input: tag_version

diff --git a/pom.xml b/pom.xml
index 25f51ce..a55da04 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -14,436 +14,440 @@
        ============LICENSE_END=========================================================\r
 -->\r
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">\r
-       <modelVersion>4.0.0</modelVersion>\r
-       <parent>\r
-               <groupId>org.onap.oparent</groupId>\r
-               <artifactId>oparent</artifactId>\r
-               <version>2.0.0</version>\r
-               <relativePath />\r
-       </parent>\r
-       <groupId>org.onap.dcaegen2.collectors.ves</groupId>\r
-       <artifactId>VESCollector</artifactId>\r
-       <version>1.5.1-SNAPSHOT</version>\r
-       <name>dcaegen2-collectors-ves</name>\r
-       <description>VESCollector</description>\r
-       <properties>\r
-               <!-- PROJECT SETTINGS -->\r
-               <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\r
-               <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>\r
-               <java.version>8</java.version>\r
-               <docker.image.name>onap/org.onap.dcaegen2.collectors.ves.vescollector</docker.image.name>\r
-               <!-- TEST SETTINGS -->\r
-               <surefire.redirectTestOutputToFile>true</surefire.redirectTestOutputToFile>\r
-               <!-- PLUGIN SETTINGS -->\r
-               <dependency.locations.enabled>false</dependency.locations.enabled>\r
-               <!-- NEXUS RELATED SETTINGS -->\r
-               <nexusproxy>https://nexus.onap.org</nexusproxy>\r
-               <snapshots.path>content/repositories/snapshots/</snapshots.path>\r
-               <releases.path>content/repositories/releases/</releases.path>\r
-               <site.path>content/sites/site/org/onap/dcaegen2/collectors/ves/${project.artifactId}/${project.version}</site.path>\r
-               <maven.build.timestamp.format>yyyyMMdd'T'HHmmss</maven.build.timestamp.format>\r
-               <onap.nexus.dockerregistry.daily>nexus3.onap.org:10003</onap.nexus.dockerregistry.daily>\r
-       </properties>\r
-       <build>\r
-               <pluginManagement>\r
-                       <plugins>\r
-                               <plugin>\r
-                                       <groupId>org.springframework.boot</groupId>\r
-                                       <artifactId>spring-boot-maven-plugin</artifactId>\r
-                               </plugin>\r
-                               <plugin>\r
-                                       <artifactId>maven-assembly-plugin</artifactId>\r
-                                       <version>3.1.0</version>\r
-                               </plugin>\r
-                               <plugin>\r
-                                       <artifactId>maven-javadoc-plugin</artifactId>\r
-                                       <version>3.0.1</version>\r
-                               </plugin>\r
-                               <plugin>\r
-                                       <artifactId>maven-project-info-reports-plugin</artifactId>\r
-                                       <version>2.9</version>\r
-                               </plugin>\r
-                               <plugin>\r
-                                       <groupId>org.apache.maven.plugins</groupId>\r
-                                       <artifactId>maven-surefire-plugin</artifactId>\r
-                                       <version>3.0.0-M1</version>\r
-                               </plugin>\r
-                               <plugin>\r
-                                       <groupId>com.spotify</groupId>\r
-                                       <artifactId>docker-maven-plugin</artifactId>\r
-                                       <version>1.2.0</version>\r
-                               </plugin>\r
-                               <plugin>\r
-                                       <groupId>org.apache.maven.plugins</groupId>\r
-                                       <artifactId>maven-enforcer-plugin</artifactId>\r
-                                       <configuration>\r
-                                               <skip>true</skip>\r
-                                       </configuration>\r
-                               </plugin>\r
-                       </plugins>\r
-               </pluginManagement>\r
-               <plugins>\r
-                       <plugin>\r
-                               <artifactId>maven-assembly-plugin</artifactId>\r
-                               <configuration>\r
-                                       <descriptors>\r
-                                               <descriptor>src/assembly/dep.xml</descriptor>\r
-                                       </descriptors>\r
-                                       <attach>false</attach>\r
-                                       <appendAssemblyId>false</appendAssemblyId>\r
-                                       <updateOnly>true</updateOnly>\r
-                               </configuration>\r
-                               <executions>\r
-                                       <execution>\r
-                                               <id>make-assembly</id>\r
-                                               <phase>package</phase>\r
-                                               <goals>\r
-                                                       <goal>single</goal>\r
-                                               </goals>\r
-                                       </execution>\r
-                               </executions>\r
-                       </plugin>\r
-                       <plugin>\r
-                               <groupId>org.springframework.boot</groupId>\r
-                               <artifactId>spring-boot-maven-plugin</artifactId>\r
-                               <executions>\r
-                                       <execution>\r
-                                               <goals>\r
-                                                       <goal>repackage</goal>\r
-                                               </goals>\r
-                                       </execution>\r
-                               </executions>\r
-                       </plugin>\r
-                       <plugin>\r
-                               <artifactId>maven-javadoc-plugin</artifactId>\r
-                               <configuration>\r
-                                       <quiet>true</quiet>\r
-                                       <verbose>false</verbose>\r
-                                       <useStandardDocletOptions>false</useStandardDocletOptions>\r
-                               </configuration>\r
-                               <executions>\r
-                                       <execution>\r
-                                               <id>aggregate</id>\r
-                                               <phase>site</phase>\r
-                                               <goals>\r
-                                                       <goal>aggregate</goal>\r
-                                               </goals>\r
-                                       </execution>\r
-                                       <execution>\r
-                                               <id>attach-javadoc</id>\r
-                                               <goals>\r
-                                                       <goal>jar</goal>\r
-                                               </goals>\r
-                                       </execution>\r
-                               </executions>\r
-                       </plugin>\r
-                       <plugin>\r
-                               <groupId>com.spotify</groupId>\r
-                               <artifactId>docker-maven-plugin</artifactId>\r
-                               <configuration>\r
-                                       <serverId>${onap.nexus.dockerregistry.daily}</serverId>\r
-                                       <imageName>${onap.nexus.dockerregistry.daily}/${docker.image.name}</imageName>\r
-                                       <imageTags>\r
-                                               <imageTag>${project.version}-${maven.build.timestamp}Z</imageTag>\r
-                                                <imageTag>${project.version}</imageTag>\r
-                                                <imageTag>latest</imageTag>\r
-                                       </imageTags>\r
-                                       <baseImage>openjdk:8-jre-slim</baseImage>\r
-                                        <user>vescollector</user>\r
-                                       <env>\r
-                                               <HOSTALIASES>/etc/host.aliases</HOSTALIASES>\r
-                                       </env>\r
-                                       <workdir>/opt/app/VESCollector</workdir>\r
-                                       <resources>\r
-                                               <resource>\r
-                                                       <targetPath>.</targetPath>\r
-                                                       <directory>${project.build.directory}/${project.artifactId}-${project.version}</directory>\r
-                                               </resource>\r
-                                       </resources>\r
-                                       <runs>\r
-                                                <run>useradd -r -U vescollector</run>\r
-                                                <run>chown -R vescollector:vescollector /opt/app</run>\r
-                                               <!-- Maven is loosing file permissions during artifacts copy -->\r
-                                               <run>chmod +x bin/*.sh</run>\r
-                                               <run><![CDATA[apt-get update && apt-get install -y --no-install-recommends procps && apt-get install -y vim && apt-get install -y curl && apt-get clean all]]></run>\r
-                                       </runs>\r
-                                       <exposes>\r
-                                               <expose>8080</expose>\r
-                                               <expose>8443</expose>\r
-                                       </exposes>\r
-                                       <cmd>bin/docker-entry.sh</cmd>\r
-                               </configuration>\r
-                               <!--<executions>\r
-                                       <execution>\r
-                                               <id>build-image</id>\r
-                                               <phase>package</phase>\r
-                                               <goals>\r
-                                                       <goal>deploy</goal>\r
-                                               </goals>\r
-                                       </execution>\r
-                                       <execution>\r
-                                               <id>tag-and-push-image-latest</id>\r
-                                               <phase>deploy</phase>\r
-                                               <goals>\r
-                                                       <goal>tag</goal>\r
-                                               </goals>\r
-                                               <configuration>\r
-                                                       <image>${docker.image.name}:latest</image>\r
-                                                       <newName>${onap.nexus.dockerregistry.daily}/${docker.image.name}:latest</newName>\r
-                                                       <pushImage>true</pushImage>\r
-                                               </configuration>\r
-                                       </execution>\r
-                                       <execution>\r
-                                               <id>tag-and-push-image-with-version</id>\r
-                                               <phase>deploy</phase>\r
-                                               <goals>\r
-                                                       <goal>tag</goal>\r
-                                               </goals>\r
-                                               <configuration>\r
-                                                       <image>${docker.image.name}:latest</image>\r
-                                                       <newName>${onap.nexus.dockerregistry.daily}/${docker.image.name}:${project.version}</newName>\r
-                                                       <pushImage>true</pushImage>\r
-                                               </configuration>\r
-                                       </execution>\r
-                                       <execution>\r
-                                               <id>tag-and-push-image-with-version-and-date</id>\r
-                                               <phase>deploy</phase>\r
-                                               <goals>\r
-                                                       <goal>tag</goal>\r
-                                               </goals>\r
-                                               <configuration>\r
-                                                       <image>${docker.image.name}:latest</image>\r
-                                                       <newName>${onap.nexus.dockerregistry.daily}/${docker.image.name}:${project.version}-${maven.build.timestamp}Z</newName>\r
-                                                       <pushImage>true</pushImage>\r
-                                               </configuration>\r
-                                       </execution>\r
-                               </executions> -->\r
-                       </plugin>\r
-               </plugins>\r
-       </build>\r
-       <profiles>\r
-               <profile>\r
-                       <id>with-system-proxy</id>\r
-                       <build>\r
-                               <plugins>\r
-                                       <plugin>\r
-                                               <groupId>com.spotify</groupId>\r
-                                               <artifactId>docker-maven-plugin</artifactId>\r
-                                               <configuration>\r
-                                                       <buildArgs>\r
-                                                               <http_proxy>${env.http_proxy}</http_proxy>\r
-                                                       </buildArgs>\r
-                                               </configuration>\r
-                                       </plugin>\r
-                               </plugins>\r
-                       </build>\r
-               </profile>\r
-       </profiles>\r
-       <reporting>\r
-               <plugins>\r
-                       <plugin>\r
-                               <artifactId>maven-project-info-reports-plugin</artifactId>\r
-                               <reportSets>\r
-                                       <reportSet>\r
-                                               <reports>\r
-                                                       <report>dependencies</report>\r
-                                                       <report>license</report>\r
-                                               </reports>\r
-                                       </reportSet>\r
-                               </reportSets>\r
-                       </plugin>\r
-                       <plugin>\r
-                               <artifactId>maven-javadoc-plugin</artifactId>\r
-                               <configuration>\r
-                                       <failOnError>false</failOnError>\r
-                                       <doclet>org.umlgraph.doclet.UmlGraphDoc</doclet>\r
-                                       <docletArtifact>\r
-                                               <groupId>org.umlgraph</groupId>\r
-                                               <artifactId>umlgraph</artifactId>\r
-                                               <version>5.6</version>\r
-                                       </docletArtifact>\r
-                                       <additionalparam>-views</additionalparam>\r
-                                       <useStandardDocletOptions>true</useStandardDocletOptions>\r
-                               </configuration>\r
-                       </plugin>\r
-               </plugins>\r
-       </reporting>\r
-       <dependencyManagement>\r
-               <dependencies>\r
-                       <dependency>\r
-                               <!-- Import dependency management from Spring Boot -->\r
-                               <groupId>org.springframework.boot</groupId>\r
-                               <artifactId>spring-boot-dependencies</artifactId>\r
-                               <version>2.1.0.RELEASE</version>\r
-                               <type>pom</type>\r
-                               <scope>import</scope>\r
-                       </dependency>\r
-               </dependencies>\r
-       </dependencyManagement>\r
-       <dependencies>\r
-               <!-- JSON RELATED -->\r
-               <dependency>\r
-                       <groupId>com.googlecode.json-simple</groupId>\r
-                       <artifactId>json-simple</artifactId>\r
-                       <version>1.1.1</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>com.github.fge</groupId>\r
-                       <artifactId>json-schema-validator</artifactId>\r
-                       <version>2.2.6</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>com.github.fge</groupId>\r
-                       <artifactId>json-schema-core</artifactId>\r
-                       <version>1.2.5</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>com.google.code.gson</groupId>\r
-                       <artifactId>gson</artifactId>\r
-                       <version>2.8.5</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.json</groupId>\r
-                       <artifactId>json</artifactId>\r
-                       <version>20160810</version>\r
-               </dependency>\r
-               <!-- REST API RELATED -->\r
-               <dependency>\r
-                       <groupId>com.att.nsa</groupId>\r
-                       <artifactId>cambriaClient</artifactId>\r
-                       <version>0.0.1</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>com.mashape.unirest</groupId>\r
-                       <artifactId>unirest-java</artifactId>\r
-                       <version>1.4.9</version>\r
-               </dependency>\r
-               <!-- MISCELLANEOUS -->\r
-               <dependency>\r
-                       <groupId>commons-collections</groupId>\r
-                       <artifactId>commons-collections</artifactId>\r
-                       <version>3.2.2</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>commons-configuration</groupId>\r
-                       <artifactId>commons-configuration</artifactId>\r
-                       <version>1.10</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>io.vavr</groupId>\r
-                       <artifactId>vavr</artifactId>\r
-                       <version>0.9.2</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.springframework.boot</groupId>\r
-                       <artifactId>spring-boot-starter-web</artifactId>\r
-            <exclusions>\r
-                <exclusion>\r
-                    <groupId>org.springframework.boot</groupId>\r
-                    <artifactId>spring-boot-starter-logging</artifactId>\r
-                </exclusion>\r
-            </exclusions>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.springframework.boot</groupId>\r
-                       <artifactId>spring-boot-starter-log4j2</artifactId>\r
-                       <version>2.1.5.RELEASE</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>io.springfox</groupId>\r
-                       <artifactId>springfox-swagger2</artifactId>\r
-                       <version>2.8.0</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>io.springfox</groupId>\r
-                       <artifactId>springfox-swagger-ui</artifactId>\r
-                       <version>2.8.0</version>\r
-                       <scope>compile</scope>\r
-               </dependency>\r
-               <!-- TESTING -->\r
-               <dependency>\r
-                       <groupId>org.junit.jupiter</groupId>\r
-                       <artifactId>junit-jupiter-api</artifactId>\r
-                       <version>5.3.1</version>\r
-                       <scope>test</scope>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.junit.jupiter</groupId>\r
-                       <artifactId>junit-jupiter-engine</artifactId>\r
-                       <version>5.3.1</version>\r
-                       <scope>test</scope>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.junit.vintage</groupId>\r
-                       <artifactId>junit-vintage-engine</artifactId>\r
-                       <version>5.3.1</version>\r
-                       <scope>test</scope>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.mockito</groupId>\r
-                       <artifactId>mockito-junit-jupiter</artifactId>\r
-                       <version>2.23.0</version>\r
-                       <scope>test</scope>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.assertj</groupId>\r
-                       <artifactId>assertj-core</artifactId>\r
-                       <version>3.8.0</version>\r
-                       <scope>test</scope>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>com.google.jimfs</groupId>\r
-                       <artifactId>jimfs</artifactId>\r
-                       <version>1.1</version>\r
-                       <scope>test</scope>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>com.github.tomakehurst</groupId>\r
-                       <artifactId>wiremock-standalone</artifactId>\r
-                       <version>2.17.0</version>\r
-                       <scope>test</scope>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.springframework.security</groupId>\r
-                       <artifactId>spring-security-test</artifactId>\r
-                       <version>5.1.1.RELEASE</version>\r
-                       <scope>test</scope>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.springframework.boot</groupId>\r
-                       <artifactId>spring-boot-starter-test</artifactId>\r
-                       <version>2.1.0.RELEASE</version>\r
-                       <scope>test</scope>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.onap.dcaegen2.services.sdk.security.crypt</groupId>\r
-                       <artifactId>crypt-password</artifactId>\r
-                       <version>1.1.6</version>\r
-               </dependency>\r
-        <dependency>\r
-            <groupId>org.onap.dcaegen2.services.sdk.standardization</groupId>\r
-            <artifactId>api-custom-header</artifactId>\r
-            <version>1.1.4</version>\r
-        </dependency>\r
-       </dependencies>\r
-       <repositories>\r
-               <repository>\r
-                       <id>external-repository</id>\r
-                       <url>https://oss.sonatype.org/content/repositories</url>\r
-               </repository>\r
-       </repositories>\r
-       <pluginRepositories>\r
-               <!-- Black Duck plugin dependencies -->\r
-               <pluginRepository>\r
-                       <id>JCenter</id>\r
-                       <name>JCenter Repository</name>\r
-                       <url>http://jcenter.bintray.com</url>\r
-               </pluginRepository>\r
-               <pluginRepository>\r
-                       <id>Restlet</id>\r
-                       <name>Restlet Repository</name>\r
-                       <url>http://maven.restlet.com</url>\r
-               </pluginRepository>\r
-       </pluginRepositories>\r
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">\r
+  <modelVersion>4.0.0</modelVersion>\r
+  <parent>\r
+    <groupId>org.onap.oparent</groupId>\r
+    <artifactId>oparent</artifactId>\r
+    <version>2.0.0</version>\r
+    <relativePath/>\r
+  </parent>\r
+  <groupId>org.onap.dcaegen2.collectors.ves</groupId>\r
+  <artifactId>VESCollector</artifactId>\r
+  <version>1.5.1-SNAPSHOT</version>\r
+  <name>dcaegen2-collectors-ves</name>\r
+  <description>VESCollector</description>\r
+  <properties>\r
+    <!-- PROJECT SETTINGS -->\r
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\r
+    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>\r
+    <java.version>8</java.version>\r
+    <docker.image.name>onap/org.onap.dcaegen2.collectors.ves.vescollector</docker.image.name>\r
+    <!-- TEST SETTINGS -->\r
+    <surefire.redirectTestOutputToFile>true</surefire.redirectTestOutputToFile>\r
+    <!-- PLUGIN SETTINGS -->\r
+    <dependency.locations.enabled>false</dependency.locations.enabled>\r
+    <!-- NEXUS RELATED SETTINGS -->\r
+    <nexusproxy>https://nexus.onap.org</nexusproxy>\r
+    <snapshots.path>content/repositories/snapshots/</snapshots.path>\r
+    <releases.path>content/repositories/releases/</releases.path>\r
+    <site.path>content/sites/site/org/onap/dcaegen2/collectors/ves/${project.artifactId}/${project.version}</site.path>\r
+    <maven.build.timestamp.format>yyyyMMdd'T'HHmmss</maven.build.timestamp.format>\r
+    <onap.nexus.dockerregistry.daily>nexus3.onap.org:10003</onap.nexus.dockerregistry.daily>\r
+  </properties>\r
+  <build>\r
+    <pluginManagement>\r
+      <plugins>\r
+        <plugin>\r
+          <groupId>org.springframework.boot</groupId>\r
+          <artifactId>spring-boot-maven-plugin</artifactId>\r
+        </plugin>\r
+        <plugin>\r
+          <artifactId>maven-assembly-plugin</artifactId>\r
+          <version>3.1.0</version>\r
+        </plugin>\r
+        <plugin>\r
+          <artifactId>maven-javadoc-plugin</artifactId>\r
+          <version>3.0.1</version>\r
+        </plugin>\r
+        <plugin>\r
+          <artifactId>maven-project-info-reports-plugin</artifactId>\r
+          <version>2.9</version>\r
+        </plugin>\r
+        <plugin>\r
+          <groupId>org.apache.maven.plugins</groupId>\r
+          <artifactId>maven-surefire-plugin</artifactId>\r
+          <version>3.0.0-M1</version>\r
+        </plugin>\r
+        <plugin>\r
+          <groupId>com.spotify</groupId>\r
+          <artifactId>docker-maven-plugin</artifactId>\r
+          <version>1.2.0</version>\r
+        </plugin>\r
+        <plugin>\r
+          <groupId>org.apache.maven.plugins</groupId>\r
+          <artifactId>maven-enforcer-plugin</artifactId>\r
+          <configuration>\r
+            <skip>true</skip>\r
+          </configuration>\r
+        </plugin>\r
+      </plugins>\r
+    </pluginManagement>\r
+    <plugins>\r
+      <plugin>\r
+        <artifactId>maven-assembly-plugin</artifactId>\r
+        <configuration>\r
+          <descriptors>\r
+            <descriptor>src/assembly/dep.xml</descriptor>\r
+          </descriptors>\r
+          <attach>false</attach>\r
+          <appendAssemblyId>false</appendAssemblyId>\r
+          <updateOnly>true</updateOnly>\r
+        </configuration>\r
+        <executions>\r
+          <execution>\r
+            <id>make-assembly</id>\r
+            <phase>package</phase>\r
+            <goals>\r
+              <goal>single</goal>\r
+            </goals>\r
+          </execution>\r
+        </executions>\r
+      </plugin>\r
+      <plugin>\r
+        <groupId>org.springframework.boot</groupId>\r
+        <artifactId>spring-boot-maven-plugin</artifactId>\r
+        <executions>\r
+          <execution>\r
+            <goals>\r
+              <goal>repackage</goal>\r
+            </goals>\r
+          </execution>\r
+        </executions>\r
+      </plugin>\r
+      <plugin>\r
+        <artifactId>maven-javadoc-plugin</artifactId>\r
+        <configuration>\r
+          <quiet>true</quiet>\r
+          <verbose>false</verbose>\r
+          <useStandardDocletOptions>false</useStandardDocletOptions>\r
+        </configuration>\r
+        <executions>\r
+          <execution>\r
+            <id>aggregate</id>\r
+            <phase>site</phase>\r
+            <goals>\r
+              <goal>aggregate</goal>\r
+            </goals>\r
+          </execution>\r
+          <execution>\r
+            <id>attach-javadoc</id>\r
+            <goals>\r
+              <goal>jar</goal>\r
+            </goals>\r
+          </execution>\r
+        </executions>\r
+      </plugin>\r
+      <plugin>\r
+        <groupId>com.spotify</groupId>\r
+        <artifactId>docker-maven-plugin</artifactId>\r
+        <configuration>\r
+          <serverId>${onap.nexus.dockerregistry.daily}</serverId>\r
+          <imageName>${onap.nexus.dockerregistry.daily}/${docker.image.name}</imageName>\r
+          <imageTags>\r
+            <imageTag>${project.version}-${maven.build.timestamp}Z</imageTag>\r
+            <imageTag>${project.version}</imageTag>\r
+            <imageTag>latest</imageTag>\r
+          </imageTags>\r
+          <baseImage>openjdk:8-jre-slim</baseImage>\r
+          <user>vescollector</user>\r
+          <env>\r
+            <HOSTALIASES>/etc/host.aliases</HOSTALIASES>\r
+          </env>\r
+          <workdir>/opt/app/VESCollector</workdir>\r
+          <resources>\r
+            <resource>\r
+              <targetPath>.</targetPath>\r
+              <directory>${project.build.directory}/${project.artifactId}-${project.version}</directory>\r
+            </resource>\r
+          </resources>\r
+          <runs>\r
+            <run>useradd -r -U vescollector</run>\r
+            <run>chown -R vescollector:vescollector /opt/app</run>\r
+            <run>mkdir /opt/app/VESCollector/logs</run>\r
+            <run>chown -R vescollector:vescollector /opt/app/VESCollector/logs</run>\r
+            <run>chown -R vescollector:vescollector /opt/app/VESCollector/etc</run>\r
+            <!-- Maven is loosing file permissions during artifacts copy -->\r
+            <run>chmod +x bin/*.sh</run>\r
+            <run>\r
+              <![CDATA[apt-get update && apt-get install -y --no-install-recommends procps && apt-get install -y vim && apt-get install -y curl && apt-get clean all]]></run>\r
+          </runs>\r
+          <exposes>\r
+            <expose>8080</expose>\r
+            <expose>8443</expose>\r
+          </exposes>\r
+          <cmd>bin/docker-entry.sh</cmd>\r
+        </configuration>\r
+        <!--<executions>\r
+          <execution>\r
+            <id>build-image</id>\r
+            <phase>package</phase>\r
+            <goals>\r
+              <goal>deploy</goal>\r
+            </goals>\r
+          </execution>\r
+          <execution>\r
+            <id>tag-and-push-image-latest</id>\r
+            <phase>deploy</phase>\r
+            <goals>\r
+              <goal>tag</goal>\r
+            </goals>\r
+            <configuration>\r
+              <image>${docker.image.name}:latest</image>\r
+              <newName>${onap.nexus.dockerregistry.daily}/${docker.image.name}:latest</newName>\r
+              <pushImage>true</pushImage>\r
+            </configuration>\r
+          </execution>\r
+          <execution>\r
+            <id>tag-and-push-image-with-version</id>\r
+            <phase>deploy</phase>\r
+            <goals>\r
+              <goal>tag</goal>\r
+            </goals>\r
+            <configuration>\r
+              <image>${docker.image.name}:latest</image>\r
+              <newName>${onap.nexus.dockerregistry.daily}/${docker.image.name}:${project.version}</newName>\r
+              <pushImage>true</pushImage>\r
+            </configuration>\r
+          </execution>\r
+          <execution>\r
+            <id>tag-and-push-image-with-version-and-date</id>\r
+            <phase>deploy</phase>\r
+            <goals>\r
+              <goal>tag</goal>\r
+            </goals>\r
+            <configuration>\r
+              <image>${docker.image.name}:latest</image>\r
+              <newName>${onap.nexus.dockerregistry.daily}/${docker.image.name}:${project.version}-${maven.build.timestamp}Z</newName>\r
+              <pushImage>true</pushImage>\r
+            </configuration>\r
+          </execution>\r
+        </executions> -->\r
+      </plugin>\r
+    </plugins>\r
+  </build>\r
+  <profiles>\r
+    <profile>\r
+      <id>with-system-proxy</id>\r
+      <build>\r
+        <plugins>\r
+          <plugin>\r
+            <groupId>com.spotify</groupId>\r
+            <artifactId>docker-maven-plugin</artifactId>\r
+            <configuration>\r
+              <buildArgs>\r
+                <http_proxy>${env.http_proxy}</http_proxy>\r
+              </buildArgs>\r
+            </configuration>\r
+          </plugin>\r
+        </plugins>\r
+      </build>\r
+    </profile>\r
+  </profiles>\r
+  <reporting>\r
+    <plugins>\r
+      <plugin>\r
+        <artifactId>maven-project-info-reports-plugin</artifactId>\r
+        <reportSets>\r
+          <reportSet>\r
+            <reports>\r
+              <report>dependencies</report>\r
+              <report>license</report>\r
+            </reports>\r
+          </reportSet>\r
+        </reportSets>\r
+      </plugin>\r
+      <plugin>\r
+        <artifactId>maven-javadoc-plugin</artifactId>\r
+        <configuration>\r
+          <failOnError>false</failOnError>\r
+          <doclet>org.umlgraph.doclet.UmlGraphDoc</doclet>\r
+          <docletArtifact>\r
+            <groupId>org.umlgraph</groupId>\r
+            <artifactId>umlgraph</artifactId>\r
+            <version>5.6</version>\r
+          </docletArtifact>\r
+          <additionalparam>-views</additionalparam>\r
+          <useStandardDocletOptions>true</useStandardDocletOptions>\r
+        </configuration>\r
+      </plugin>\r
+    </plugins>\r
+  </reporting>\r
+  <dependencyManagement>\r
+    <dependencies>\r
+      <dependency>\r
+        <!-- Import dependency management from Spring Boot -->\r
+        <groupId>org.springframework.boot</groupId>\r
+        <artifactId>spring-boot-dependencies</artifactId>\r
+        <version>2.1.0.RELEASE</version>\r
+        <type>pom</type>\r
+        <scope>import</scope>\r
+      </dependency>\r
+    </dependencies>\r
+  </dependencyManagement>\r
+  <dependencies>\r
+    <!-- JSON RELATED -->\r
+    <dependency>\r
+      <groupId>com.googlecode.json-simple</groupId>\r
+      <artifactId>json-simple</artifactId>\r
+      <version>1.1.1</version>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>com.github.fge</groupId>\r
+      <artifactId>json-schema-validator</artifactId>\r
+      <version>2.2.6</version>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>com.github.fge</groupId>\r
+      <artifactId>json-schema-core</artifactId>\r
+      <version>1.2.5</version>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>com.google.code.gson</groupId>\r
+      <artifactId>gson</artifactId>\r
+      <version>2.8.5</version>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>org.json</groupId>\r
+      <artifactId>json</artifactId>\r
+      <version>20160810</version>\r
+    </dependency>\r
+    <!-- REST API RELATED -->\r
+    <dependency>\r
+      <groupId>com.att.nsa</groupId>\r
+      <artifactId>cambriaClient</artifactId>\r
+      <version>0.0.1</version>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>com.mashape.unirest</groupId>\r
+      <artifactId>unirest-java</artifactId>\r
+      <version>1.4.9</version>\r
+    </dependency>\r
+    <!-- MISCELLANEOUS -->\r
+    <dependency>\r
+      <groupId>commons-collections</groupId>\r
+      <artifactId>commons-collections</artifactId>\r
+      <version>3.2.2</version>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>commons-configuration</groupId>\r
+      <artifactId>commons-configuration</artifactId>\r
+      <version>1.10</version>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>io.vavr</groupId>\r
+      <artifactId>vavr</artifactId>\r
+      <version>0.9.2</version>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>org.springframework.boot</groupId>\r
+      <artifactId>spring-boot-starter-web</artifactId>\r
+      <exclusions>\r
+        <exclusion>\r
+          <groupId>org.springframework.boot</groupId>\r
+          <artifactId>spring-boot-starter-logging</artifactId>\r
+        </exclusion>\r
+      </exclusions>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>org.springframework.boot</groupId>\r
+      <artifactId>spring-boot-starter-log4j2</artifactId>\r
+      <version>2.1.5.RELEASE</version>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>io.springfox</groupId>\r
+      <artifactId>springfox-swagger2</artifactId>\r
+      <version>2.8.0</version>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>io.springfox</groupId>\r
+      <artifactId>springfox-swagger-ui</artifactId>\r
+      <version>2.8.0</version>\r
+      <scope>compile</scope>\r
+    </dependency>\r
+    <!-- TESTING -->\r
+    <dependency>\r
+      <groupId>org.junit.jupiter</groupId>\r
+      <artifactId>junit-jupiter-api</artifactId>\r
+      <version>5.3.1</version>\r
+      <scope>test</scope>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>org.junit.jupiter</groupId>\r
+      <artifactId>junit-jupiter-engine</artifactId>\r
+      <version>5.3.1</version>\r
+      <scope>test</scope>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>org.junit.vintage</groupId>\r
+      <artifactId>junit-vintage-engine</artifactId>\r
+      <version>5.3.1</version>\r
+      <scope>test</scope>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>org.mockito</groupId>\r
+      <artifactId>mockito-junit-jupiter</artifactId>\r
+      <version>2.23.0</version>\r
+      <scope>test</scope>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>org.assertj</groupId>\r
+      <artifactId>assertj-core</artifactId>\r
+      <version>3.8.0</version>\r
+      <scope>test</scope>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>com.google.jimfs</groupId>\r
+      <artifactId>jimfs</artifactId>\r
+      <version>1.1</version>\r
+      <scope>test</scope>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>com.github.tomakehurst</groupId>\r
+      <artifactId>wiremock-standalone</artifactId>\r
+      <version>2.17.0</version>\r
+      <scope>test</scope>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>org.springframework.security</groupId>\r
+      <artifactId>spring-security-test</artifactId>\r
+      <version>5.1.1.RELEASE</version>\r
+      <scope>test</scope>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>org.springframework.boot</groupId>\r
+      <artifactId>spring-boot-starter-test</artifactId>\r
+      <version>2.1.0.RELEASE</version>\r
+      <scope>test</scope>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>org.onap.dcaegen2.services.sdk.security.crypt</groupId>\r
+      <artifactId>crypt-password</artifactId>\r
+      <version>1.1.6</version>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>org.onap.dcaegen2.services.sdk.standardization</groupId>\r
+      <artifactId>api-custom-header</artifactId>\r
+      <version>1.1.4</version>\r
+    </dependency>\r
+  </dependencies>\r
+  <repositories>\r
+    <repository>\r
+      <id>external-repository</id>\r
+      <url>https://oss.sonatype.org/content/repositories</url>\r
+    </repository>\r
+  </repositories>\r
+  <pluginRepositories>\r
+    <!-- Black Duck plugin dependencies -->\r
+    <pluginRepository>\r
+      <id>JCenter</id>\r
+      <name>JCenter Repository</name>\r
+      <url>http://jcenter.bintray.com</url>\r
+    </pluginRepository>\r
+    <pluginRepository>\r
+      <id>Restlet</id>\r
+      <name>Restlet Repository</name>\r
+      <url>http://maven.restlet.com</url>\r
+    </pluginRepository>\r
+  </pluginRepositories>\r
 </project>\r

diff --git a/src/main/java/org/onap/dcae/ApplicationSettings.java b/src/main/java/org/onap/dcae/ApplicationSettings.java
index 205659c..5164f87 100644 (file)
--- a/src/main/java/org/onap/dcae/ApplicationSettings.java
+++ b/src/main/java/org/onap/dcae/ApplicationSettings.java
@@ -74,7 +74,6 @@ public class ApplicationSettings {
         loadedJsonSchemas = loadJsonSchemas();
     }
 
-
     public void reloadProperties() {
         try {
             properties.load(configurationFileLocation);

diff --git a/src/main/java/org/onap/dcae/common/configuration/ApiConfiguration.java b/src/main/java/org/onap/dcae/common/configuration/ApiConfiguration.java
new file mode 100644 (file)
index 0000000..52e3a6d
--- /dev/null
+++ b/src/main/java/org/onap/dcae/common/configuration/ApiConfiguration.java
@@ -0,0 +1,49 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * org.onap.dcaegen2.collectors.ves
+ * ================================================================================
+ * Copyright (C) 2018 - 2019 Nokia. All rights reserved.
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.dcae.common.configuration;
+
+import org.onap.dcae.ApplicationSettings;
+import org.onap.dcae.restapi.ApiAuthInterceptor;
+import org.slf4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.EnableWebMvc;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+@Configuration
+@EnableWebMvc
+public class ApiConfiguration implements WebMvcConfigurer {
+
+  private final ApplicationSettings applicationSettings;
+  private Logger errorLogger;
+
+  @Autowired
+  ApiConfiguration(ApplicationSettings applicationSettings, Logger errorLogger) {
+    this.applicationSettings = applicationSettings;
+    this.errorLogger = errorLogger;
+  }
+
+  @Override
+  public void addInterceptors(InterceptorRegistry registry) {
+    registry.addInterceptor(new ApiAuthInterceptor(applicationSettings, errorLogger));
+  }
+}

diff --git a/src/main/java/org/onap/dcae/common/configuration/CertAuth.java b/src/main/java/org/onap/dcae/common/configuration/CertAuth.java
index 6bd924c..5303114 100644 (file)
--- a/src/main/java/org/onap/dcae/common/configuration/CertAuth.java
+++ b/src/main/java/org/onap/dcae/common/configuration/CertAuth.java
@@ -3,7 +3,7 @@
  * PROJECT
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * Copyright (C) 2018 Nokia. All rights reserved.s
+ * Copyright (C) 2018 - 2019 Nokia. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,9 +26,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.web.server.Ssl.ClientAuth;
 import org.springframework.boot.web.servlet.server.ConfigurableServletWebServerFactory;
-import org.springframework.context.annotation.Configuration;
 
-@Configuration
 public class CertAuth implements AuthMethod {
 
   private static final Logger log = LoggerFactory.getLogger(CertAuth.class);

diff --git a/src/main/java/org/onap/dcae/common/configuration/CertBasicAuth.java b/src/main/java/org/onap/dcae/common/configuration/CertBasicAuth.java
index 38d5ad5..fa4a1b2 100644 (file)
--- a/src/main/java/org/onap/dcae/common/configuration/CertBasicAuth.java
+++ b/src/main/java/org/onap/dcae/common/configuration/CertBasicAuth.java
@@ -3,7 +3,7 @@
  * PROJECT
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * Copyright (C) 2018 Nokia. All rights reserved.s
+ * Copyright (C) 2018 - 2019 Nokia. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,9 +26,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.web.server.Ssl.ClientAuth;
 import org.springframework.boot.web.servlet.server.ConfigurableServletWebServerFactory;
-import org.springframework.context.annotation.Configuration;
 
-@Configuration
 public class CertBasicAuth  implements AuthMethod{
 
   private static final Logger log = LoggerFactory.getLogger(CertAuth.class);

diff --git a/src/main/java/org/onap/dcae/common/configuration/TomcatHttpConfig.java b/src/main/java/org/onap/dcae/common/configuration/TomcatHttpConfig.java
new file mode 100644 (file)
index 0000000..4495f34
--- /dev/null
+++ b/src/main/java/org/onap/dcae/common/configuration/TomcatHttpConfig.java
@@ -0,0 +1,54 @@
+/*
+ * ============LICENSE_START=======================================================
+ * PROJECT
+ * ================================================================================
+ * Copyright (C) 2019 Nokia. All rights reserved.
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.dcae.common.configuration;
+
+import org.apache.catalina.connector.Connector;
+import org.onap.dcae.ApplicationSettings;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
+import org.springframework.boot.web.servlet.server.ServletWebServerFactory;
+import org.springframework.context.annotation.Bean;
+import org.springframework.stereotype.Component;
+
+@Component
+public class TomcatHttpConfig {
+
+  @Autowired
+  private ApplicationSettings settings;
+
+  @Bean
+  private ServletWebServerFactory servletContainer() {
+
+    TomcatServletWebServerFactory tomcat = new TomcatServletWebServerFactory();
+      if(!(settings.authMethod().equalsIgnoreCase(AuthMethodType.NO_AUTH.value())) && settings.httpsEnabled()){
+        tomcat.addAdditionalTomcatConnectors(getHttpConnector());
+      }
+    return tomcat;
+  }
+
+  private Connector getHttpConnector() {
+    Connector connector = new Connector(TomcatServletWebServerFactory.DEFAULT_PROTOCOL);
+    connector.setScheme("http");
+    connector.setPort(settings.httpPort());
+    connector.setSecure(false);
+    return connector;
+  }
+}

diff --git a/src/main/java/org/onap/dcae/restapi/ApiAuthInterceptor.java b/src/main/java/org/onap/dcae/restapi/ApiAuthInterceptor.java
index 9b387b8..a928159 100644 (file)
--- a/src/main/java/org/onap/dcae/restapi/ApiAuthInterceptor.java
+++ b/src/main/java/org/onap/dcae/restapi/ApiAuthInterceptor.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * org.onap.dcaegen2.collectors.ves
  * ================================================================================
- * Copyright (C) 2018 Nokia. All rights reserved.
+ * Copyright (C) 2018 - 2019 Nokia. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,11 +23,6 @@ import io.vavr.control.Option;
 import java.io.IOException;
 import java.security.cert.X509Certificate;
 import java.util.Base64;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.onap.dcae.ApplicationSettings;
@@ -37,9 +32,10 @@ import org.onap.dcaegen2.services.sdk.security.CryptPassword;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
+import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
 
 @Component
-public class ApiAuthInterceptor implements Filter {
+public class ApiAuthInterceptor extends HandlerInterceptorAdapter {
 
     private static final Logger LOG = LoggerFactory.getLogger(ApiAuthInterceptor.class);
     private static final String CERTIFICATE_X_509 = "javax.servlet.request.X509Certificate";
@@ -53,32 +49,33 @@ public class ApiAuthInterceptor implements Filter {
         this.errorLogger = errorLogger;
     }
 
-
     @Override
-    public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
+    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler)
+        throws IOException {
+
         SubjectMatcher subjectMatcher = new SubjectMatcher(settings,(X509Certificate[]) request.getAttribute(CERTIFICATE_X_509));
 
-        if(settings.authMethod().equalsIgnoreCase(AuthMethodType.CERT_ONLY.value())){
-            if( validateCertRequest((HttpServletResponse )response, subjectMatcher)){
-                chain.doFilter(request, response);
-                return;
+        if(!settings.authMethod().equalsIgnoreCase(AuthMethodType.NO_AUTH.value()) && request.getServerPort() == settings.httpPort() ){
+            if(request.getRequestURI().replaceAll("^/|/$", "").equalsIgnoreCase("healthcheck")){
+                return true;
             }
-            return;
+            response.getWriter().write("Operation not permitted");
+            response.setStatus(400);
+            return false;
+        }
+
+        if(settings.authMethod().equalsIgnoreCase(AuthMethodType.CERT_ONLY.value())){
+            return validateCertRequest(response, subjectMatcher);
         }
 
         if(isCertSubject(subjectMatcher)){
-            chain.doFilter(request, response);
-            return;
+            return true;
         }
 
         if (isBasicAuth() ) {
-            if(validateBasicHeader((HttpServletRequest)request, (HttpServletResponse)response)){
-                chain.doFilter(request, response);
-                return;
-            }
-            return;
+            return validateBasicHeader(request, response);
         }
-        chain.doFilter(request, response);
+        return true;
     }
 
     private boolean validateBasicHeader(HttpServletRequest request, HttpServletResponse response)
@@ -110,6 +107,7 @@ public class ApiAuthInterceptor implements Filter {
             LOG.info("Cert and subjectDN is valid");
             return true;
         }
+        LOG.info(String.format(MESSAGE, settings.certSubjectMatcher()));
         return false;
     }
 
@@ -129,7 +127,7 @@ public class ApiAuthInterceptor implements Filter {
             return userRegistered && cryptPassword.matches(providedPassword,maybeSavedPassword.get());
         } catch (Exception e) {
             LOG.warn(String.format("Could not check if user is authorized (header: '%s')), probably malformed header.",
-                    authorizationHeader), e);
+                authorizationHeader), e);
             return false;
         }
     }

diff --git a/src/main/java/org/onap/dcae/restapi/SwaggerConfig.java b/src/main/java/org/onap/dcae/restapi/SwaggerConfig.java
index 267db05..03432cf 100644 (file)
--- a/src/main/java/org/onap/dcae/restapi/SwaggerConfig.java
+++ b/src/main/java/org/onap/dcae/restapi/SwaggerConfig.java
@@ -3,6 +3,7 @@
  * PROJECT
  * ================================================================================
  * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2019 Nokia. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,7 +29,6 @@ import springfox.documentation.spi.DocumentationType;
 import springfox.documentation.spring.web.plugins.Docket;
 import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
-@Configuration
 @EnableSwagger2
 public class SwaggerConfig{
 

diff --git a/src/main/java/org/onap/dcae/restapi/WebMvcConfig.java b/src/main/java/org/onap/dcae/restapi/WebMvcConfig.java
index c3e2a5d..c8dd7ba 100644 (file)
--- a/src/main/java/org/onap/dcae/restapi/WebMvcConfig.java
+++ b/src/main/java/org/onap/dcae/restapi/WebMvcConfig.java
@@ -3,7 +3,7 @@
  * PROJECT
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * Copyright (C) 2018 Nokia. All rights reserved.s
+ * Copyright (C) 2018 - 2019 Nokia. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,12 +22,10 @@
 package org.onap.dcae.restapi;
 
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
 import org.springframework.web.servlet.view.InternalResourceViewResolver;
 
-@Configuration
 public class WebMvcConfig extends WebMvcConfigurationSupport {
 
     @Override

diff --git a/src/test/java/org/onap/dcae/TLSTest.java b/src/test/java/org/onap/dcae/TLSTest.java
index 3cf0a16..49a089c 100644 (file)
--- a/src/test/java/org/onap/dcae/TLSTest.java
+++ b/src/test/java/org/onap/dcae/TLSTest.java
@@ -4,6 +4,7 @@
  * ================================================================================
  * Copyright (C) 2018 Nokia. All rights reserved.
  * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2019 Nokia. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -102,6 +103,7 @@ public class TLSTest extends TLSTestBase {
         @Override
         protected void configureSettings(ApplicationSettings settings) {
             when(settings.authMethod()).thenReturn(AuthMethodType.NO_AUTH.value());
+            when(settings.httpPort()).thenReturn(1111);
         }
     }
 
@@ -115,6 +117,7 @@ public class TLSTest extends TLSTestBase {
             when(settings.keystorePasswordFileLocation()).thenReturn(KEYSTORE_PASSWORD_FILE.toString());
             when(settings.authMethod()).thenReturn(AuthMethodType.BASIC_AUTH.value());
             when(settings.validAuthorizationCredentials()).thenReturn(HashMap.of(USERNAME, "$2a$10$51tDgG2VNLde5E173Ay/YO.Fq.aD.LR2Rp8pY3QAKriOSPswvGviy"));
+            when(settings.httpPort()).thenReturn(1111);
         }
     }
 
@@ -126,6 +129,7 @@ public class TLSTest extends TLSTestBase {
             when(settings.truststoreFileLocation()).thenReturn(TRUSTSTORE.toString());
             when(settings.truststorePasswordFileLocation()).thenReturn(TRUSTSTORE_PASSWORD_FILE.toString());
             when(settings.certSubjectMatcher()).thenReturn(CERT_SUBJECT_MATCHER.toString());
+            when(settings.httpPort()).thenReturn(1111);
         }
     }
 
@@ -134,6 +138,7 @@ public class TLSTest extends TLSTestBase {
         protected void configureSettings(ApplicationSettings settings) {
             super.configureSettings(settings);
             when(settings.authMethod()).thenReturn(AuthMethodType.CERT_BASIC_AUTH.value());
+            when(settings.httpPort()).thenReturn(1111);
         }
     }
 }
\ No newline at end of file

diff --git a/src/test/java/org/onap/dcae/TLSTestBase.java b/src/test/java/org/onap/dcae/TLSTestBase.java
index df10ead..1eb5728 100644 (file)
--- a/src/test/java/org/onap/dcae/TLSTestBase.java
+++ b/src/test/java/org/onap/dcae/TLSTestBase.java
@@ -4,6 +4,7 @@
  * ================================================================================
  * Copyright (C) 2018 Nokia. All rights reserved.
  * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2019 Nokia. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,12 +22,20 @@
 
 package org.onap.dcae;
 
-import org.json.JSONObject;
+import static org.onap.dcae.TestingUtilities.configureKeyStore;
+import static org.onap.dcae.TestingUtilities.createRestTemplateWithSsl;
+import static org.onap.dcae.TestingUtilities.readFile;
+import static org.onap.dcae.TestingUtilities.rethrow;
+import static org.onap.dcae.TestingUtilities.sslBuilderWithTrustStore;
+
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mockito;
 import org.onap.dcae.common.EventSender;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.boot.web.server.LocalServerPort;
 import org.springframework.context.annotation.Bean;
@@ -37,12 +46,6 @@ import org.springframework.http.client.support.BasicAuthenticationInterceptor;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.web.client.RestTemplate;
 
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.concurrent.LinkedBlockingQueue;
-
-import static org.onap.dcae.TestingUtilities.*;
-
 @Configuration
 @ExtendWith(SpringExtension.class)
 public class TLSTestBase {
@@ -66,7 +69,7 @@ public class TLSTestBase {
         protected abstract void configureSettings(final ApplicationSettings settings);
     }
 
-    @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+    @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
     protected abstract class TestClassBase {
 
         @MockBean

diff --git a/src/test/java/org/onap/dcae/restapi/ApiAuthInterceptionTest.java b/src/test/java/org/onap/dcae/restapi/ApiAuthInterceptionTest.java
index 4398faa..e6d67cf 100644 (file)
--- a/src/test/java/org/onap/dcae/restapi/ApiAuthInterceptionTest.java
+++ b/src/test/java/org/onap/dcae/restapi/ApiAuthInterceptionTest.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * org.onap.dcaegen2.collectors.ves
  * ================================================================================
- * Copyright (C) 2018 Nokia. All rights reserved.
+ * Copyright (C) 2018 - 2019 Nokia. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,18 +20,8 @@
 
 package org.onap.dcae.restapi;
 
-import static org.mockito.Mockito.atLeastOnce;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 import io.vavr.collection.HashMap;
 import io.vavr.collection.Map;
-import java.io.IOException;
-import java.io.PrintWriter;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
@@ -45,128 +35,143 @@ import org.springframework.http.HttpStatus;
 import org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors;
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.PrintWriter;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 @RunWith(MockitoJUnitRunner.Silent.class)
 public class ApiAuthInterceptionTest {
-    private static final String USERNAME = "Foo";
-    private static final String PASSWORD = "Bar";
-    private static final Map<String, String> CREDENTIALS = HashMap.of(USERNAME, PASSWORD);
+  private static final String USERNAME = "Foo";
+  private static final String PASSWORD = "Bar";
+  private static final Map<String, String> CREDENTIALS = HashMap.of(USERNAME, PASSWORD);
 
-    @Mock
-    private Logger log;
+  @Mock
+  private Logger log;
 
-    @Mock
-    private ApplicationSettings settings;
+  @Mock
+  private ApplicationSettings settings;
 
-    @Mock
-    private HttpServletResponse response;
+  @Mock
+  private HttpServletResponse response;
 
-    @Mock
-    private FilterChain obj;
+  @Mock
+  private Object obj;
 
-    @Mock
-    private PrintWriter writer;
+  @Mock
+  private PrintWriter writer;
 
-    @InjectMocks
-    private ApiAuthInterceptor sut;
+  @InjectMocks
+  private ApiAuthInterceptor sut;
 
 
-    private HttpServletRequest createEmptyRequest() {
-        return MockMvcRequestBuilders
+  private HttpServletRequest createEmptyRequest() {
+    return MockMvcRequestBuilders
+        .post("")
+        .buildRequest(null);
+  }
+
+  private HttpServletRequest createRequestWithAuthorizationHeader() {
+    return SecurityMockMvcRequestPostProcessors
+        .httpBasic(USERNAME, PASSWORD)
+        .postProcessRequest(
+            MockMvcRequestBuilders
                 .post("")
-                .buildRequest(null);
-    }
-
-    private HttpServletRequest createRequestWithAuthorizationHeader() {
-        return SecurityMockMvcRequestPostProcessors
-                .httpBasic(USERNAME, PASSWORD)
-                .postProcessRequest(
-                        MockMvcRequestBuilders
-                                .post("")
-                                .buildRequest(null));
-    }
-
-    @Test
-    public void shouldSucceedWhenAuthorizationIsDisabled() throws IOException, ServletException {
-        // given
-        final HttpServletRequest request = createEmptyRequest();
-
-        when(settings.authMethod()).thenReturn(AuthMethodType.NO_AUTH.value());
-
-        // when
-        sut.doFilter(request, response, obj);
-
-        // then
-        verify(obj, atLeastOnce()).doFilter(request, response);
-    }
-
-    @Test
-    public void shouldFailDueToEmptyBasicAuthorizationHeader() throws IOException, ServletException {
-        // given
-        final HttpServletRequest request = createEmptyRequest();
-
-        when(settings.authMethod()).thenReturn(AuthMethodType.BASIC_AUTH.value());
-        when(response.getWriter()).thenReturn(writer);
-
-        // when
-        sut.doFilter(request, response, obj);
-
-        // then
-        verify(response).setStatus(HttpStatus.UNAUTHORIZED.value());
-        verify(writer).write(ApiException.UNAUTHORIZED_USER.toJSON().toString());
-    }
-
-    @Test
-    public void shouldFailDueToBasicAuthenticationUserMissingFromSettings()
-        throws IOException, ServletException {
-        // given
-        final HttpServletRequest request = createRequestWithAuthorizationHeader();
-
-        when(settings.authMethod()).thenReturn(AuthMethodType.BASIC_AUTH.value());
-        when(response.getWriter()).thenReturn(writer);
-
-        // when
-        sut.doFilter(request, response, obj);
-
-        // then
-        verify(response).setStatus(HttpStatus.UNAUTHORIZED.value());
-        verify(writer).write(ApiException.UNAUTHORIZED_USER.toJSON().toString());
-    }
-
-    @Test
-    public void shouldSucceed() throws IOException, ServletException {
-        // given
-        final HttpServletRequest request = createRequestWithAuthorizationHeader();
-        when(settings.authMethod()).thenReturn(AuthMethodType.BASIC_AUTH.value());
-        when(settings.validAuthorizationCredentials()).thenReturn(
-            HashMap.of(USERNAME, "$2a$10$BsZkEynNm/93wbAeeZuxJeu6IHRyQl4XReqDg2BtYOFDhUsz20.3G"));
-        when(response.getWriter()).thenReturn(writer);
-
-        // when
-        sut.doFilter(request, response, obj);
-
-        // then
-        verify(obj, atLeastOnce()).doFilter(request, response);
-    }
-
-    @Test
-    public void shouldFailDueToInvalidBasicAuthorizationHeaderValue()
-        throws IOException, ServletException {
-        // given
-        final HttpServletRequest request =
-                MockMvcRequestBuilders
-                        .post("")
-                        .header(HttpHeaders.AUTHORIZATION, "FooBar")
-                        .buildRequest(null);
-
-        when(settings.authMethod()).thenReturn(AuthMethodType.BASIC_AUTH.value());
-        when(settings.validAuthorizationCredentials()).thenReturn(CREDENTIALS);
-        when(response.getWriter()).thenReturn(writer);
-
-        // when
-        sut.doFilter(request, response, obj);
-
-        //then
-        verify(response).setStatus(HttpStatus.UNAUTHORIZED.value());
-        verify(writer).write(ApiException.UNAUTHORIZED_USER.toJSON().toString());
-    }
+                .buildRequest(null));
+  }
+
+  @Test
+  public void shouldSucceedWhenAuthorizationIsDisabled() throws IOException {
+    // given
+    final HttpServletRequest request = createEmptyRequest();
+
+    when(settings.authMethod()).thenReturn(AuthMethodType.NO_AUTH.value());
+
+    // when
+    final boolean isAuthorized = sut.preHandle(request, response, obj);
+
+    // then
+    assertTrue(isAuthorized);
+  }
+
+  @Test
+  public void shouldFailDueToEmptyBasicAuthorizationHeader() throws IOException {
+    // given
+    final HttpServletRequest request = createEmptyRequest();
+
+    when(settings.authMethod()).thenReturn(AuthMethodType.BASIC_AUTH.value());
+    when(response.getWriter()).thenReturn(writer);
+
+    // when
+    final boolean isAuthorized = sut.preHandle(request, response, obj);
+
+
+    // then
+    assertFalse(isAuthorized);
+
+    verify(response).setStatus(HttpStatus.UNAUTHORIZED.value());
+    verify(writer).write(ApiException.UNAUTHORIZED_USER.toJSON().toString());
+  }
+
+  @Test
+  public void shouldFailDueToBasicAuthenticationUserMissingFromSettings() throws IOException {
+    // given
+    final HttpServletRequest request = createRequestWithAuthorizationHeader();
+
+    when(settings.authMethod()).thenReturn(AuthMethodType.BASIC_AUTH.value());
+    when(response.getWriter()).thenReturn(writer);
+
+    // when
+    final boolean isAuthorized = sut.preHandle(request, response, obj);
+
+    // then
+    assertFalse(isAuthorized);
+
+    verify(response).setStatus(HttpStatus.UNAUTHORIZED.value());
+    verify(writer).write(ApiException.UNAUTHORIZED_USER.toJSON().toString());
+  }
+
+  @Test
+  public void shouldSucceed() throws IOException {
+    // given
+    final HttpServletRequest request = createRequestWithAuthorizationHeader();
+    when(settings.authMethod()).thenReturn(AuthMethodType.BASIC_AUTH.value());
+    when(settings.validAuthorizationCredentials()).thenReturn(
+        HashMap.of(USERNAME, "$2a$10$BsZkEynNm/93wbAeeZuxJeu6IHRyQl4XReqDg2BtYOFDhUsz20.3G"));
+    when(response.getWriter()).thenReturn(writer);
+
+    // when
+    final boolean isAuthorized = sut.preHandle(request, response, obj);
+
+    // then
+    assertTrue(isAuthorized);
+  }
+
+  @Test
+  public void shouldFailDueToInvalidBasicAuthorizationHeaderValue() throws IOException {
+    // given
+    final HttpServletRequest request =
+        MockMvcRequestBuilders
+            .post("")
+            .header(HttpHeaders.AUTHORIZATION, "FooBar")
+            .buildRequest(null);
+
+    when(settings.authMethod()).thenReturn(AuthMethodType.BASIC_AUTH.value());
+    when(settings.validAuthorizationCredentials()).thenReturn(CREDENTIALS);
+    when(response.getWriter()).thenReturn(writer);
+
+    // when
+    final boolean isAuthorized = sut.preHandle(request, response, obj);
+
+    // then
+    assertFalse(isAuthorized);
+
+    verify(response).setStatus(HttpStatus.UNAUTHORIZED.value());
+    verify(writer).write(ApiException.UNAUTHORIZED_USER.toJSON().toString());
+  }
 }