Remove certificates and private keys from code

A file empty_file.txt has been added to allow stage3 to
build NBI docker image. It will be removed in subsequent
changes.

Change-Id: Ib82d30ecc6db88edc77a9c351d238141a249eaae
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>

diff --git a/osm_nbi/http/cert.pem b/osm_nbi/http/cert.pem
deleted file mode 100644 (file)
index f9d63a8..0000000
--- a/osm_nbi/http/cert.pem
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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.
-
------BEGIN CERTIFICATE-----
-MIID6zCCAtOgAwIBAgIJAP5stGSyLGztMA0GCSqGSIb3DQEBCwUAMIGLMQswCQYD
-VQQGEwJlczEPMA0GA1UECAwGTWFkcmlkMQ8wDQYDVQQHDAZNYWRyaWQxFzAVBgNV
-BAoMDm9wZW5zb3VyY2VtYW5vMQwwCgYDVQQLDANvc20xDDAKBgNVBAMMA25iaTEl
-MCMGCSqGSIb3DQEJARYWb3NtX3RlY2hAbGlzdC5ldHNpLm9yZzAeFw0yMDA2MDMy
-MTUyNDlaFw0yMzAyMjgyMTUyNDlaMIGLMQswCQYDVQQGEwJlczEPMA0GA1UECAwG
-TWFkcmlkMQ8wDQYDVQQHDAZNYWRyaWQxFzAVBgNVBAoMDm9wZW5zb3VyY2VtYW5v
-MQwwCgYDVQQLDANvc20xDDAKBgNVBAMMA25iaTElMCMGCSqGSIb3DQEJARYWb3Nt
-X3RlY2hAbGlzdC5ldHNpLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBANeULui/JoUxmDPkZwy3rwYT4I9Ju2ph00Lun7/OdvV+r4j8xkYmB+Hh8gBE
-eB26gt5rvAAy8q6IcEIxti2a2792Zw8E8zj7OnX6pFJAUjnZUJVuj4hM+Gp5hp4M
-o+AFIIN9roccAGbAKHs59cSqm5jz+bZPP4PegjCShmB7vzT68Hd/c/XTN9OUDJ6U
-9nroJ+wwfjJrgXiMaiV70IdN5STjLxVa0OA/fa8RutxHAut5y8D1oL4q5/SOaulh
-weE8SjH7vEA/wkVBM7LJpR1h2V+kD9tcIQZehnH3l8q4ksgyAT81dOI8sdHEws62
-3VqEUf9V3Lx69SWyDEF27+rxQpcCAwEAAaNQME4wHQYDVR0OBBYEFOwsHZAv1uCn
-ea9W6N3qiJwK87Y7MB8GA1UdIwQYMBaAFOwsHZAv1uCnea9W6N3qiJwK87Y7MAwG
-A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAMxlDMcDLgOs6n9nPNnF93fr
-1MnONSJBeJogVdn9x+h1eKRI5I4jhuT9xDdyMj62X+gdUx9t2kE7ES21S06h+g06
-cI1pBere8AnCw8frTjtO1Jga5Cx0mlcv8ozrlXSl5PW/+jS/UAjKqyECxy+6+EfT
-u/9X39qzB0j1ELyahcjUXwVoYc2DNcHSwz6ORNYqZ38TQ5/skd1Ol39al1/UzoUh
-TpbHdV/ytbLPtI93cO6CS+GlErXDyIXCZmZD8ur2+uvPKdbRVVn9I/8B9w/FtfrQ
-Ye46uci6bWOq4U1rjarTun1xAkpJ3wo6lB4G0rU+r1CXhA+duSUMeqCs8BLC6Tk=
------END CERTIFICATE-----

diff --git a/osm_nbi/http/empty_file.txt b/osm_nbi/http/empty_file.txt
new file mode 100644 (file)
index 0000000..04f7d49
--- /dev/null
+++ b/osm_nbi/http/empty_file.txt
@@ -0,0 +1,16 @@
+#######################################################################################
+# Copyright ETSI Contributors and Others.
+#
+# 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.
+#######################################################################################

diff --git a/osm_nbi/http/privkey.pem b/osm_nbi/http/privkey.pem
deleted file mode 100644 (file)
index a6510e2..0000000
--- a/osm_nbi/http/privkey.pem
+++ /dev/null
@@ -1,40 +0,0 @@
-# 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.
-
------BEGIN RSA PRIVATE KEY-----
-MIIEogIBAAKCAQEA15Qu6L8mhTGYM+RnDLevBhPgj0m7amHTQu6fv8529X6viPzG
-RiYH4eHyAER4HbqC3mu8ADLyrohwQjG2LZrbv3ZnDwTzOPs6dfqkUkBSOdlQlW6P
-iEz4anmGngyj4AUgg32uhxwAZsAoezn1xKqbmPP5tk8/g96CMJKGYHu/NPrwd39z
-9dM305QMnpT2eugn7DB+MmuBeIxqJXvQh03lJOMvFVrQ4D99rxG63EcC63nLwPWg
-virn9I5q6WHB4TxKMfu8QD/CRUEzssmlHWHZX6QP21whBl6GcfeXyriSyDIBPzV0
-4jyx0cTCzrbdWoRR/1XcvHr1JbIMQXbv6vFClwIDAQABAoIBAHX/hi2fc1Y0bzr4
-Ke+sGwEYoDHOCeeQ5DIeqxIx0KtPTIWO1nhPGMFrCytaTuT20esszRrOyEcAJ3IU
-A8Oyn9WM2Zw++WKXIMizCH589oTzjkg83BOfDdo56pVYFdro84MFqCIMEawsQfwx
-HXUobUKrSGOhvQJRKLGtgiANm/tC3lu7O6MNKF39GAOVCF5SKAmkXu5PJn1CmFLR
-DV8PrEAHqVz+yxsFszp6mraaFBjnTMejctO+65qwHS5eSsIcfJcy+woYnIj6nTkC
-VO84zW6ChGVeWwBBvRlJDwjDibwyld9Le9dSNLYupIdJDV5TTGLZqVK9quHsYR1c
-llYBfwECgYEA8MlJlYlYy19JhzLA/bKW7HFlTqpK3onhSxKNQoyGF8fU2naNu5s4
-Oh2+5XXxoaW/iTAO0RHKFKXKSBplx2c2Q2+ef4mtW+ulfZa5c70tr1QQm3aIy8AI
-LRA/znmlQG9vq2BK4/xeoH7j4J2qBeABzIkQaaJjY5eeNqOaRgq0eWMCgYEA5TMq
-gxbHEtrKBYfS+RniM0nVoSAeqTzvBVgPcC1FUtiwZ4qlhIddB0cBYi4BuJoHLegF
-riqJ76u+By/YLHx735Fh5xihMkVYwWNRLZi9qlXo9SMJOab1xL/9YQ3NiZ0ROL2Q
-n7jHX5gMxJNhMLe1JHnhy2RC+bGJbAqU0MtJMj0CgYBvws4PxX9cbi7/vNQNLV6W
-ApAmMi6sGk1i/gppEDaRRSSL/ikNIh+4AeSANv1frUI42ACYk+w7JzS7wNzq8AIk
-zONBiVLY7oiSwWn0yaMx1RAcSKl4APsKh5dGK/pC7TZk0j4QkiwNzLfSovuu3GmZ
-WSkwDrqZGF/MNqW9yuw3xwKBgA8HGM15i9nvoHlWW33btZoZSDmFSp1cEmvuRyza
-uwXgkUhorcuPuIjGng+a5p/88WWQJfcycNLXFuGPwIPCMbkJ5jppwf/yzgv4ABWW
-QzFM6rZP8sXl7Y1V7T4U0pooQz3OKBJg4imhZYzqAOBZ2zWmDCjyzPVkL5d25iT+
-fzEdAoGAex0PciuH1Z/zvR4AWG38MCukFX5LMCbfxXYeGkYKFDdlmxQUsTf97/Ra
-PhLpBYEkf4G7yrL0pzzB5xs9PHvGHotoNTLRfnc41W34byx9mgJqcfkHsa+6vWAt
-RczfIbQ9NSDJq7Edgc8wNz1LdojCKDYbaaQ9DSWVZZPFrUae3Fk=
------END RSA PRIVATE KEY-----

diff --git a/osm_nbi/nbi.cfg b/osm_nbi/nbi.cfg
index 7035cae..977c610 100644 (file)
--- a/osm_nbi/nbi.cfg
+++ b/osm_nbi/nbi.cfg
@@ -34,11 +34,6 @@ tools.staticdir.dir: "/app/NBI/osm_nbi/html_public"
 [global]
 server.socket_host: "0.0.0.0"
 server.socket_port: 9999
-
-server.ssl_module: "builtin"
-server.ssl_certificate: "./http/cert.pem"
-server.ssl_private_key: "./http/privkey.pem"
-server.ssl_pass_phrase: "osm4u"
 server.thread_pool: 10
 
 # Uncomment for allow basic authentication apart from bearer

diff --git a/osm_nbi/nbi.py b/osm_nbi/nbi.py
index c37e24e..d169cdd 100644 (file)
--- a/osm_nbi/nbi.py
+++ b/osm_nbi/nbi.py
@@ -2533,23 +2533,6 @@ def _stop_service():
 
 def nbi(config_file):
     global nbi_server
-    # conf = {
-    #     '/': {
-    #         #'request.dispatch': cherrypy.dispatch.MethodDispatcher(),
-    #         'tools.sessions.on': True,
-    #         'tools.response_headers.on': True,
-    #         # 'tools.response_headers.headers': [('Content-Type', 'text/plain')],
-    #     }
-    # }
-    # cherrypy.Server.ssl_module = 'builtin'
-    # cherrypy.Server.ssl_certificate = "http/cert.pem"
-    # cherrypy.Server.ssl_private_key = "http/privkey.pem"
-    # cherrypy.Server.thread_pool = 10
-    # cherrypy.config.update({'Server.socket_port': config["port"], 'Server.socket_host': config["host"]})
-
-    # cherrypy.config.update({'tools.auth_basic.on': True,
-    #    'tools.auth_basic.realm': 'localhost',
-    #    'tools.auth_basic.checkpassword': validate_password})
     nbi_server = Server()
     cherrypy.engine.subscribe("start", _start_service)
     cherrypy.engine.subscribe("stop", _stop_service)