From 9d5855bc6e4482e1e4fc8164b45b54eb551f9329 Mon Sep 17 00:00:00 2001 From: stephb9959 Date: Mon, 8 May 2023 22:38:39 -0700 Subject: [PATCH] https://telecominfraproject.atlassian.net/browse/WIFI-12525 Signed-off-by: stephb9959 --- build | 2 +- docker-entrypoint.sh | 10 + owsec.properties | 30 +- owsec.properties.tmpl | 10 + templates/email_verification.html | 16 +- templates/password_reset.html | 36 +- templates/signup_verification.html | 36 +- templates/sub_email_verification.html | 527 ++++++++++++++++++++++++++ templates/sub_email_verification.txt | 9 + templates/sub_password_reset.html | 523 +++++++++++++++++++++++++ templates/sub_password_reset.txt | 9 + templates/sub_verification_code.html | 515 +++++++++++++++++++++++++ templates/sub_verification_code.txt | 10 + templates/verification_code.html | 20 +- wwwassets/footer.html | 6 +- wwwassets/sub_common.css | 171 +++++++++ wwwassets/sub_footer.html | 6 +- 17 files changed, 1865 insertions(+), 71 deletions(-) create mode 100644 wwwassets/sub_common.css diff --git a/build b/build index dec2bf5..2edeafb 100644 --- a/build +++ b/build @@ -1 +1 @@ -19 \ No newline at end of file +20 \ No newline at end of file diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 684c914..95e7396 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -60,6 +60,16 @@ if [[ "$TEMPLATE_CONFIG" = 'true' ]]; then STORAGE_TYPE_MYSQL_PASSWORD=${STORAGE_TYPE_MYSQL_PASSWORD:-"owsec"} \ STORAGE_TYPE_MYSQL_DATABASE=${STORAGE_TYPE_MYSQL_DATABASE:-"owsec"} \ STORAGE_TYPE_MYSQL_PORT=${STORAGE_TYPE_MYSQL_PORT:-"3306"} \ + USER_HELPER_EMAIL=${USER_HELPER_EMAIL:-"openwifi@telecominfraproject.com"} \ + SUB_HELPER_EMAIL=${SUB_HELPER_EMAIL:-"openwifi@telecominfraproject.com"} \ + GLOBAL_USER_HELPER_EMAIL=${GLOBAL_USER_HELPER_EMAIL:-"openwifi@telecominfraproject.com"} \ + GLOBAL_SUB_HELPER_EMAIL=${GLOBAL_SUB_HELPER_EMAIL:-"openwifi@telecominfraproject.com"} \ + USER_HELPER_SITE=${USER_HELPER_SITE:-"https://openwifi.telecominfraproject.com"} \ + SUB_HELPER_SITE=${SUB_HELPER_SITE:-"https://openwifi.telecominfraproject.com"} \ + USER_SYSTEM_LOGIN=${USER_SYSTEM_LOGIN:-"https://openwifi.telecominfraproject.com"} \ + SUB_SYSTEM_LOGIN=${SUB_SYSTEM_LOGIN:-"https://openwifi.telecominfraproject.com"} \ + USER_SIGNATURE=${USER_SIGNATURE:-"Telecom Infra Project"} \ + SUB_SIGNATURE=${SUB_SIGNATURE:-"Telecom Infra Project"} \ envsubst < /owsec.properties.tmpl > $OWSEC_CONFIG/owsec.properties fi diff --git a/owsec.properties b/owsec.properties index 3ca7353..98874ae 100644 --- a/owsec.properties +++ b/owsec.properties @@ -34,8 +34,8 @@ authentication.default.username = tip@ucentral.com authentication.default.password = 13268b7daa751240369d125e79c873bd8dd3bef7981bdfd38ea03dbb1fbe7dcf openwifi.system.data = $OWSEC_ROOT/data openwifi.system.uri.private = https://localhost:17001 -openwifi.system.uri.public = https://local.dpaas.arilia.com:16001 -openwifi.system.uri.ui = https://ucentral-ui.arilia.com +openwifi.system.uri.public = https://main.server.com:16001 +openwifi.system.uri.ui = https://ucentral-ui.main.server.com openwifi.security.restapi.disable = false openwifi.system.commandchannel = /tmp/app.ucentralsec openwifi.service.key = $OWSEC_ROOT/certs/restapi-key.pem @@ -64,9 +64,19 @@ mailer.loginmethod = login mailer.port = 587 mailer.templates = $OWSEC_ROOT/templates +helper.user.email = openwifi@telecominfraproject.com +helper.sub.email = openwifi@telecominfraproject.com +helper.user.global.email = openwifi@telecominfraproject.com +helper.sub.global.email = openwifi@telecominfraproject.com +helper.user.site = https://openwifi.telecominfraproject.com +helper.sub.site = https://openwifi.telecominfraproject.com +helper.user.login = https://openwifi.telecominfraproject.com +helper.sub.login = https://openwifi.telecominfraproject.com +helper.user.signature = Telecom Infra Project +helper.sub.signature = Telecom Infra Project ############################# -# Generic information for all micro services +# Generic information for all micro-services ############################# # # NLB Support @@ -80,7 +90,7 @@ alb.port = 16101 openwifi.kafka.group.id = security openwifi.kafka.client.id = security1 openwifi.kafka.enable = true -openwifi.kafka.brokerlist = a1.arilia.com:9092 +openwifi.kafka.brokerlist = kafka:9092 openwifi.kafka.auto.commit = false openwifi.kafka.queue.buffering.max.ms = 50 openwifi.kafka.ssl.ca.location = @@ -110,18 +120,18 @@ storage.type.sqlite.maxsessions = 128 storage.type.postgresql.maxsessions = 64 storage.type.postgresql.idletime = 60 storage.type.postgresql.host = localhost -storage.type.postgresql.username = stephb -storage.type.postgresql.password = snoopy99 -storage.type.postgresql.database = ucentral +storage.type.postgresql.username = owsec +storage.type.postgresql.password = owsec +storage.type.postgresql.database = owsec storage.type.postgresql.port = 5432 storage.type.postgresql.connectiontimeout = 60 storage.type.mysql.maxsessions = 64 storage.type.mysql.idletime = 60 storage.type.mysql.host = localhost -storage.type.mysql.username = stephb -storage.type.mysql.password = snoopy99 -storage.type.mysql.database = ucentral +storage.type.mysql.username = owsec +storage.type.mysql.password = owsec +storage.type.mysql.database = owsec storage.type.mysql.port = 3306 storage.type.mysql.connectiontimeout = 60 diff --git a/owsec.properties.tmpl b/owsec.properties.tmpl index 6f54d37..0fbf861 100644 --- a/owsec.properties.tmpl +++ b/owsec.properties.tmpl @@ -64,6 +64,16 @@ mailer.loginmethod = login mailer.port = ${MAILER_PORT} mailer.templates = ${MAILER_TEMPLATES} +helper.user.email = ${USER_HELPER_EMAIL} +helper.sub.email = ${SUB_HELPER_EMAIL} +helper.user.global.email = ${GLOBAL_USER_HELPER_EMAIL} +helper.sub.global.email = ${GLOBAL_SUB_HELPER_EMAIL} +helper.user.site = ${USER_HELPER_SITE} +helper.sub.site = ${SUB_HELPER_SITE} +helper.user.login = ${USER_SYSTEM_LOGIN} +helper.sub.login = ${SUB_SYSTEM_LOGIN} +helper.user.signature = ${USER_SIGNATURE} +helper.sub.signature = ${SUB_SIGNATURE} ############################# # Generic information for all micro services diff --git a/templates/email_verification.html b/templates/email_verification.html index 9f78bb2..993c359 100644 --- a/templates/email_verification.html +++ b/templates/email_verification.html @@ -435,18 +435,18 @@ regarding this application, please contact us at - tip-keys@arilia.com + ${USER_HELPER_EMAIL} . For question regarding the Telecom Infra Project, please contact us at - info@telecominfraproject.com + ${GLOBAL_USER_HELPER_EMAIL} .

@@ -456,7 +456,7 @@

Thank You!

-

Arilia Wireless Inc.

+

${USER_SIGNATURE}

@@ -502,13 +502,13 @@

Copyright 2023 - Arilia Wireless Inc, + ${USER_SIGNATURE}, All rights reserved.

www.arilia.com${USER_HELPER_SITE} diff --git a/templates/password_reset.html b/templates/password_reset.html index 7e7be7b..5dcac46 100644 --- a/templates/password_reset.html +++ b/templates/password_reset.html @@ -431,18 +431,18 @@ regarding this application, please contact us at - tip-keys@arilia.com + ${USER_HELPER_EMAIL} . For question regarding the Telecom Infra Project, please contact us at - info@telecominfraproject.com + ${GLOBAL_USER_HELPER_EMAIL} .

@@ -452,7 +452,7 @@

Thank You!

-

Arilia Wireless Inc.

+

${USER_SIGNATURE}

@@ -494,19 +494,19 @@ style="min-width: 100%" > - - -

- Copyright 2023 - Arilia Wireless Inc, - All rights reserved. -

- + +

+ Copyright 2023 + ${USER_SIGNATURE}, + All rights reserved. +

+ www.arilia.com - + >${USER_HELPER_SITE} + diff --git a/templates/signup_verification.html b/templates/signup_verification.html index 3b9b538..c2d0009 100644 --- a/templates/signup_verification.html +++ b/templates/signup_verification.html @@ -435,18 +435,18 @@ regarding this application, please contact us at - tip-keys@arilia.com + ${USER_HELPER_EMAIL} . For question regarding the Telecom Infra Project, please contact us at - info@telecominfraproject.com + ${GLOBAL_USER_HELPER_EMAIL} .

@@ -456,7 +456,7 @@

Thank You!

-

Arilia Wireless Inc.

+

${USER_SIGNATURE}

@@ -498,19 +498,19 @@ style="min-width: 100%" > - - -

- Copyright 2023 - Arilia Wireless Inc, - All rights reserved. -

- + +

+ Copyright 2023 + ${USER_SIGNATURE}, + All rights reserved. +

+ www.arilia.com - + >${USER_HELPER_SITE} + diff --git a/templates/sub_email_verification.html b/templates/sub_email_verification.html index e69de29..97c9a6e 100644 --- a/templates/sub_email_verification.html +++ b/templates/sub_email_verification.html @@ -0,0 +1,527 @@ + + + Email Confirmation + + + + + + + + + + + + + +
+ + + + + + +
+ + + + +

+ Copyright 2023 + ${SUB_SIGNATURE}, + All rights reserved. +

+ ${SUB_HELPER_SITE} + + +
+
+
+ + +   + + + + diff --git a/templates/sub_email_verification.txt b/templates/sub_email_verification.txt index e69de29..f251762 100644 --- a/templates/sub_email_verification.txt +++ b/templates/sub_email_verification.txt @@ -0,0 +1,9 @@ +Dear ${RECIPIENT_EMAIL}, + + Before you can access the system, you must validate your e-mail address. Please click on the link below to complete this task. + + ${ACTION_LINK} + + And follow the instructions. + +Thank you! \ No newline at end of file diff --git a/templates/sub_password_reset.html b/templates/sub_password_reset.html index e69de29..08d4991 100644 --- a/templates/sub_password_reset.html +++ b/templates/sub_password_reset.html @@ -0,0 +1,523 @@ + + + Password Reset + + + + + + + + + + + + + +
+ + + + + + +
+ + + + +

+ Copyright 2023 + ${SUB_SIGNATURE}, + All rights reserved. +

+ ${SUB_HELPER_SITE} + + +
+
+
+ + +   + + + + diff --git a/templates/sub_password_reset.txt b/templates/sub_password_reset.txt index e69de29..7b3f964 100644 --- a/templates/sub_password_reset.txt +++ b/templates/sub_password_reset.txt @@ -0,0 +1,9 @@ +Dear ${RECIPIENT_EMAIL}, + + You have requested us to reset your password. Please click on the link below + + ${ACTION_LINK} + + And follow the instructions. + +Thank you! \ No newline at end of file diff --git a/templates/sub_verification_code.html b/templates/sub_verification_code.html index e69de29..3548cfa 100644 --- a/templates/sub_verification_code.html +++ b/templates/sub_verification_code.html @@ -0,0 +1,515 @@ + + + Verification Code + + + + + + + + + + + + + +
+ + + + + + +
+ + + + +

+ Copyright 2023 + ${SUB_SIGNATURE}, + All rights reserved. +

+ ${SUB_HELPER_SITE} + + +
+
+
+ + +   + + + + diff --git a/templates/sub_verification_code.txt b/templates/sub_verification_code.txt index e69de29..51551eb 100644 --- a/templates/sub_verification_code.txt +++ b/templates/sub_verification_code.txt @@ -0,0 +1,10 @@ +Dear ${RECIPIENT_EMAIL}, + + You have requested your login validation. Please enter the following code on the login screen: + + ${CHALLENGE_CODE} + + If you are not trying to login, please login and change your password. Someone may be trying to + access your account illegally. + +Thank you! \ No newline at end of file diff --git a/templates/verification_code.html b/templates/verification_code.html index f7f95bb..6813d38 100644 --- a/templates/verification_code.html +++ b/templates/verification_code.html @@ -423,18 +423,18 @@ regarding this application, please contact us at - tip-keys@arilia.com + ${USER_HELPER_EMAIL} . For question regarding the Telecom Infra Project, please contact us at - info@telecominfraproject.com + ${GLOBAL_USER_HELPER_EMAIL} .

@@ -444,7 +444,7 @@

Thank You!

-

Arilia Wireless Inc.

+

${USER_SIGNATURE}

@@ -490,13 +490,13 @@

Copyright 2023 - Arilia Wireless Inc, + ${USER_SIGNATURE}, All rights reserved.

www.arilia.com${USER_HELPER_SITE} diff --git a/wwwassets/footer.html b/wwwassets/footer.html index eb8fc05..5bbf8ec 100644 --- a/wwwassets/footer.html +++ b/wwwassets/footer.html @@ -2,10 +2,10 @@

For questions & support regarding this application, please contact us at - tip-keys@arilia.com. + ${USER_HELPER_EMAIL}. For question regarding the Telecom Infra Project, please contact us at - - info@telecominfraproject.com + + ${GLOBAL_USER_HELPER_EMAIL} .

\ No newline at end of file diff --git a/wwwassets/sub_common.css b/wwwassets/sub_common.css new file mode 100644 index 0000000..356e806 --- /dev/null +++ b/wwwassets/sub_common.css @@ -0,0 +1,171 @@ +body {font-family: Arial, Helvetica, sans-serif;} + +input[type=text], input[type=password] { + width: 100%; + padding: 12px 20px; + margin: 8px 0; + display: inline-block; + border: 1px solid #ccc; + box-sizing: border-box; +} + +button { + background-color: #04AA6D; + color: white; + padding: 14px 20px; + margin: 8px 0; + border: none; + cursor: pointer; + width: 100%; +} + +button:hover { + opacity: 0.8; +} + +.logo-grid { + display: grid; + grid-template-columns: 20% 60% 20%; + margin-top: calc(10vh) +} + +.logo-grid > div > img { + width: 100%; + height: 100%; + max-height: 200px; + object-fit: contain; +} + + +.info-card { + padding: 30px; + box-shadow: 0 4px 8px 0 rgba(0,0,0,0.2); + display: block; + width: 50%; + min-width: 400px; + border: 1em; + background-color: white; + width: 40%; + height: auto; + margin-left: auto; + margin-right: auto; + margin-bottom: auto; + margin-top: 50px; + position: relative; + border-radius: 15px; +} + +.info-list { + margin-left: 5%; +} + +.info-title { + margin-left: 5%; + color: #63B3ED; +} + +.flex-box { + display: flex; + flex-direction: row; + justify-content: left; + align-items: center; + margin-left: 5%; + margin-top: 6px; + margin-bottom: 6px; + min-height: 30px +} + +.flex-box > h3 { + margin-right: 4px; + margin-top: 5px; + margin-bottom: 5px; +} + +.container { + padding: 16px; +} + +span.password1 { + float: right; + padding-top: 16px; +} + +body { + background-color: #ebedef; +} + +/* Change styles for span and cancel button on extra small screens */ +@media screen and (max-width: 300px) { + span.password1 { + display: block; + float: none; + } + .cancelbtn { + width: 100%; + } +} + +.form-container { + border: 0px; + margin-left: 5%; +} + +.form-label { + float: left; +} + +.form-input { + border-radius: 15px; +} + +.form-control { + margin-bottom: 6px; +} + +.form-submit-btn { + display: inline-flex; + appearance: none; + -webkit-box-align: center; + align-items: center; + -webkit-box-pack: center; + justify-content: center; + -webkit-user-select: none; + position: relative; + white-space: nowrap; + vertical-align: middle; + outline-color: transparent; + outline-style: solid; + outline-width: 2px; + outline-offset: 2px; + line-height: 1.2; + border-top-left-radius: 15px; + border-top-right-radius: 15px; + border-bottom-right-radius: 15px; + border-bottom-left-radius: 15px; + height: 45px; + background-color:#4299E1; + font-size: 15px; + padding-inline-start: 16px; + padding-inline-end: 16px; + width: 100%; + margin-bottom: 20px; + color: white; + margin-top: 20px; +} + +.footer{ + display: flex; + flex-direction: row; + justify-content: left; + align-items: center; + margin-left: 5%; +} + +hr.rounded { + margin-top: 40px; + margin-bottom: 0px; + margin-left: 5%; + margin-right: 5%; + border-top: 1px solid #bbb; + border-radius: 5px; +} \ No newline at end of file diff --git a/wwwassets/sub_footer.html b/wwwassets/sub_footer.html index eb8fc05..891bebc 100644 --- a/wwwassets/sub_footer.html +++ b/wwwassets/sub_footer.html @@ -2,10 +2,10 @@

For questions & support regarding this application, please contact us at - tip-keys@arilia.com. + ${SUB_HELPER_EMAIL}. For question regarding the Telecom Infra Project, please contact us at - - info@telecominfraproject.com + + ${GLOBAL_SUB_HELPER_EMAIL} .

\ No newline at end of file