Disabling security by default 01/1501/1
authorPatrikBuhr <patrik.buhr@est.tech>
Wed, 6 Nov 2019 12:31:57 +0000 (13:31 +0100)
committerPatrikBuhr <patrik.buhr@est.tech>
Tue, 12 Nov 2019 12:39:38 +0000 (13:39 +0100)
Enable by JVM property -Dspring.profiles.active=webSecurity

Change-Id: I8cae7cb9aeb382e531e369bb3061e3ad9f982bff
Issue-ID: NONRTRIC-61
Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
dashboard/pom.xml
dashboard/webapp-backend/pom.xml
dashboard/webapp-backend/src/main/resources/application.properties
dashboard/webapp-backend/src/main/resources/key.properties [new file with mode: 0644]
dashboard/webapp-backend/src/main/resources/portal.properties [new file with mode: 0644]
dashboard/webapp-frontend/pom.xml

index 7123fef..1473449 100644 (file)
@@ -29,11 +29,11 @@ limitations under the License.
                <version>2.1.9.RELEASE</version>
                <relativePath /> <!-- lookup parent from repository -->
        </parent>
-       <groupId>org.o-ran-sc.portal.ric-dashboard</groupId>
+       <groupId>org.o-ran-sc.nonrt.ric-dashboard</groupId>
        <artifactId>ric-dash-parent</artifactId>
-       <name>RIC Dashboard project</name>
+       <name>NonRT RIC Dashboard project</name>
        <packaging>pom</packaging>
-       <version>1.2.5-SNAPSHOT</version>
+       <version>1.0.0-SNAPSHOT</version>
        <properties>
                <java.version>11</java.version>
                <!-- Properties for the license-maven-plugin in child POMs -->
index ec4fdea..a7100be 100644 (file)
@@ -23,12 +23,12 @@ limitations under the License.
        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>
        <parent>
-               <groupId>org.o-ran-sc.portal.ric-dashboard</groupId>
+               <groupId>org.o-ran-sc.nonrt.ric-dashboard</groupId>
                <artifactId>ric-dash-parent</artifactId>
-               <version>1.2.5-SNAPSHOT</version>
+               <version>1.0.0-SNAPSHOT</version>
        </parent>
        <artifactId>ric-dash-be</artifactId>
-       <name>RIC Dashboard Webapp backend</name>
+       <name>NonRT RIC Dashboard Webapp backend</name>
        <properties>
                <springfox.version>2.9.2</springfox.version>
                <!-- Set by Jenkins -->
index 585e795..0cb9891 100644 (file)
@@ -30,7 +30,7 @@ server.port = 8080
 userfile = users.json
 
 # boolean flag whether to enforce Portal user and roles on requests
-portalapi.security = true
+portalapi.security = false
 # class that decrypts ciphertext from Portal
 portalapi.decryptor = org.oransc.ric.portal.dashboard.portalapi.PortalSdkDecryptorAes
 # name of request cookie with user ID
diff --git a/dashboard/webapp-backend/src/main/resources/key.properties b/dashboard/webapp-backend/src/main/resources/key.properties
new file mode 100644 (file)
index 0000000..85a5689
--- /dev/null
@@ -0,0 +1,22 @@
+# ========================LICENSE_START=================================
+# O-RAN-SC
+# %%
+# Copyright (C) 2019 AT&T Intellectual Property
+# %%
+# 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===================================
+
+# Test properties for the EPSDK-FW library.
+# This file must be present on the Java classpath.
+
+cipher.enc.key = bogus
diff --git a/dashboard/webapp-backend/src/main/resources/portal.properties b/dashboard/webapp-backend/src/main/resources/portal.properties
new file mode 100644 (file)
index 0000000..8c7fec7
--- /dev/null
@@ -0,0 +1,34 @@
+# ========================LICENSE_START=================================
+# O-RAN-SC
+# %%
+# Copyright (C) 2019 AT&T Intellectual Property
+# %%
+# 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===================================
+
+# Template for the file that provides properties for the EPSDK-FW library.
+# This file must be present on the Java classpath.
+
+# The following properties are the same in every deployment
+
+portal.api.impl.class = org.oransc.ric.portal.dashboard.portalapi.PortalRestCentralServiceImpl
+role_access_centralized = remote
+
+# The following properties are DIFFERENT in every deployment
+
+# URL of portal login screen
+ecomp_redirect_url = http://localhost/portal
+# URL of portal API
+ecomp_rest_url = http://localhost/portal
+# Value assigned by portal instance
+ueb_app_key = abcdef1234567890
index fd75241..2888f73 100644 (file)
@@ -23,12 +23,12 @@ limitations under the License.
        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>
        <parent>
-               <groupId>org.o-ran-sc.portal.ric-dashboard</groupId>
+               <groupId>org.o-ran-sc.nonrt.ric-dashboard</groupId>
                <artifactId>ric-dash-parent</artifactId>
-               <version>1.2.5-SNAPSHOT</version>
+               <version>1.0.0-SNAPSHOT</version>
        </parent>
        <artifactId>ric-dash-fe</artifactId>
-       <name>RIC Dashboard Webapp frontend</name>
+       <name>NonRT RIC Dashboard Webapp frontend</name>
        <build>
                <plugins>
                        <plugin>