WebUI Integration on ARM System Ready.

conf/distro/include/rdk-genericarm.inc

@@ -167,8 +167,6 @@ DISTRO_FEATURES:append:broadband = " partner_default_ext"
 # RDKBDEV-755: Add Asterisk IP PBX voice HAL for TelcoVoiceManager
 #DISTRO_FEATURES:append:broadband = " Asterisk"
 
-# Remove WebUI (does not work without erouter0)
-DISTRO_FEATURES:remove:broadband = " webui_jst"
 
 # Add new EasyMesh
 DISTRO_FEATURES:append:broadband = " EasyMesh"

conf/include/rdk-bbmasks-rdkb-platform.inc

@@ -120,7 +120,6 @@ BBMASK .= "|meta-rdk-broadband/recipes-ccsp/ccsp/ccsp-gwprovapp-epon.bb"
 BBMASK .= "|meta-rdk-broadband/recipes-ccsp/ccsp/ccsp-wifi-agent.bb"
 BBMASK .= "|meta-rdk-broadband/recipes-ccsp/ccsp/ccsp-mta-agent.bb"
 BBMASK .= "|meta-rdk-broadband/recipes-ccsp/ccsp/rdktelcovoicemanager.bb"
-BBMASK .= "|meta-rdk-broadband/recipes-ccsp/ccsp/ccsp-webui-jst.bb"
 BBMASK .= "|meta-rdk-broadband/recipes-ccsp/ccsp/ccsp-webui-php.bb"
 
 BBMASK .= "|meta-cmf-broadband/recipes-core/util-linux/util-linux_%.bbappend"

meta-rdk-broadband/recipes-ccsp/ccsp/ccsp-common-library.bbappend

@@ -17,6 +17,7 @@ SRC_URI:append = " \
     file://brlan0_check.sh \
     file://brlan0_check.service \
     file://onewifi.service \
+    file://gwprovapp.conf \
 "
 
 # Some systemd unit files invoke through '/bin/sh -c (...)' which causes
@@ -84,7 +85,10 @@ do_install:append:class-target () {
 
     sed -i -- 's/NotifyAccess=.*/#NotifyAccess=main/g' ${D}${systemd_unitdir}/system/CcspCrSsp.service
     sed -i -- 's/notify.*/forking/g' ${D}${systemd_unitdir}/system/CcspCrSsp.service
-
+    # Install gwprov app conf
+    install -D -m 0644 ${S}/systemd_units/gwprovapp.service ${D}${systemd_unitdir}/system/gwprovapp.service
+    install -D -m 0644 ${WORKDIR}/gwprovapp.conf ${D}${systemd_unitdir}/system/gwprovapp.service.d/gwprovapp.conf
+    sed -i -e '/ConditionPathExists/d' ${D}${systemd_unitdir}/system/gwprovapp.service
     #copy rfc.properties into nvram
     sed -i '/ExecStartPre/ a\ExecStartPre=-/bin/cp /etc/rfc.properties /nvram/' ${D}${systemd_unitdir}/system/rfc.service
     sed -i 's#${PARODUS_START_LOG_FILE}#/rdklogs/logs/dcmrfc.log#g' ${D}${systemd_unitdir}/system/rfc.service
@@ -114,6 +118,7 @@ do_install:append:class-target () {
      DISTRO_WAN_ENABLED="${@bb.utils.contains('DISTRO_FEATURES','rdkb_wan_manager','true','false',d)}"
      if [ $DISTRO_WAN_ENABLED = 'true' ]; then
      install -D -m 0644 ${S}/systemd_units/RdkWanManager.service ${D}${systemd_unitdir}/system/RdkWanManager.service
+     sed -i "/WorkingDirectory/a ExecStartPre=/bin/sh /lib/rdk/run_rm_key.sh" ${D}${systemd_unitdir}/system/RdkWanManager.service
      sed -i "s/After=CcspCrSsp.service/After=CcspCrSsp.service utopia.service /g" ${D}${systemd_unitdir}/system/RdkWanManager.service
      sed -i "s/CcspPandMSsp.service/CcspCrSsp.service CcspPandMSsp.service/g" ${D}${systemd_unitdir}/system/CcspEthAgent.service
      install -D -m 0644 ${WORKDIR}/utopia.service ${D}${systemd_unitdir}/system/utopia.service
@@ -152,6 +157,7 @@ fi' ${D}/usr/ccsp/ccspPAMCPCheck.sh
         fi
     fi
 
+    rm -f ${D}${systemd_unitdir}/system/utopia.service
 }
 
 SYSTEMD_SERVICE:${PN}:append = " CcspCrSsp.service"
@@ -166,6 +172,8 @@ SYSTEMD_SERVICE:${PN}:append = " CcspEthAgent.service"
 SYSTEMD_SERVICE:${PN}:append = " ProcessResetDetect.path"
 SYSTEMD_SERVICE:${PN}:append = " ProcessResetDetect.service"
 SYSTEMD_SERVICE:${PN}:append = " rfc.service"
+SYSTEMD_SERVICE_${PN}:remove = " utopia.service"
+SYSTEMD_SERVICE_${PN}:append = "gwprovapp.service"
 SYSTEMD_SERVICE:${PN}:append = " notifyComp.service"
 SYSTEMD_SERVICE:${PN}:append = " CcspXdnsSsp.service"
 SYSTEMD_SERVICE:${PN}:append = " wan-initialized.path"
@@ -201,6 +209,8 @@ FILES:${PN}:append = " \
     ${systemd_unitdir}/system/CcspXdnsSsp.service \
     ${systemd_unitdir}/system/wan-initialized.target \
     ${systemd_unitdir}/system/wan-initialized.path \
+    ${systemd_unitdir}/system/gwprovapp.service \
+    ${systemd_unitdir}/system/gwprovapp.service.d/gwprovapp.conf \
 "
 FILES:${PN}:append = "${@bb.utils.contains('DISTRO_FEATURES', 'rdkb_wan_manager', ' ${systemd_unitdir}/system/RdkWanManager.service ${systemd_unitdir}/system/utopia.service ${systemd_unitdir}/system/RdkVlanManager.service ${systemd_unitdir}/system/RdkTelcoVoiceManager.service ', '', d)}"
 FILES:${PN}:append = "${@bb.utils.contains('DISTRO_FEATURES', 'fwupgrade_manager', ' ${systemd_unitdir}/system/RdkFwUpgradeManager.service ', '', d)}"

meta-rdk-broadband/recipes-ccsp/ccsp/ccsp-p-and-m.bbappend

@@ -57,11 +57,70 @@ do_install:append(){
     install -m 644 ${S}/config-arm/CcspPam.cfg -t ${D}/usr/ccsp/pam
     install -m 644 ${S}/config-arm/TR181-USGv2.XML -t ${D}/usr/ccsp/pam
 
+    install -m 755 ${S}/arch/intel_usg/boards/arm_shared/scripts/network_response.sh ${D}/usr/ccsp/pam/network_response.sh
+    install -m 755 ${S}/arch/intel_usg/boards/arm_shared/scripts/network_response.sh ${D}/etc/network_response.sh
+    install -m 755 ${S}/arch/intel_usg/boards/arm_shared/scripts/redirect_url.sh ${D}/usr/ccsp/pam/redirect_url.sh
+    install -m 755 ${S}/arch/intel_usg/boards/arm_shared/scripts/revert_redirect.sh ${D}/usr/ccsp/pam/revert_redirect.sh
+    install -m 755 ${S}/arch/intel_usg/boards/arm_shared/scripts/redirect_url.sh ${D}/etc/redirect_url.sh
+    install -m 755 ${S}/arch/intel_usg/boards/arm_shared/scripts/revert_redirect.sh ${D}/etc/revert_redirect.sh
+    install -m 755 ${S}/arch/intel_usg/boards/arm_shared/scripts/restart_services.sh ${D}/etc/restart_services.sh
+    install -m 755 ${S}/arch/intel_usg/boards/arm_shared/scripts/whitelist.sh ${D}/usr/ccsp/pam/whitelist.sh
+    install -m 755 ${S}/arch/intel_usg/boards/arm_shared/scripts/moca_status.sh ${D}/usr/ccsp/pam/moca_status.sh
     install -m 777 ${D}/usr/bin/CcspPandMSsp -t ${D}/usr/ccsp/pam/
 
     install -d ${D}/fss/gw/usr/sbin
     ln -sf /sbin/ip.iproute2 ${D}/fss/gw/usr/sbin/ip
-
+    #captiveportal redirection
+    DISTRO_ENABLED="${@bb.utils.contains('DISTRO_FEATURES','webui_jst','true','false',d)}"
+    if [ $DISTRO_ENABLED = 'false' ]; then
+    sed -i "/captiveportaldhcp/a fi" ${D}/etc/revert_redirect.sh
+    sed -i "/captiveportaldhcp/a lighttpd -f /var/lighttpd.conf" ${D}/etc/revert_redirect.sh
+    sed -i "/captiveportaldhcp/a sleep 2" ${D}/etc/revert_redirect.sh
+    sed -i "/captiveportaldhcp/a killall lighttpd" ${D}/etc/revert_redirect.sh
+    sed -i "/captiveportaldhcp/a sed -i '\$d' /var/lighttpd.conf" ${D}/etc/revert_redirect.sh
+    sed -i "/captiveportaldhcp/a sed -i '\$d' /var/lighttpd.conf" ${D}/etc/revert_redirect.sh
+    sed -i "/captiveportaldhcp/a sed -e '/url.redirect/ s/^#*/#/' -i /var/lighttpd.conf" ${D}/etc/revert_redirect.sh
+    sed -i "/captiveportaldhcp/a if [ \$CAPTIVEPORTAL == \"$\" ] ; then"  ${D}/etc/revert_redirect.sh
+    sed -i "/captiveportaldhcp/a CAPTIVEPORTAL=\`cat /var/lighttpd.conf | grep captiveportal.php | cut -c1\`" ${D}/etc/revert_redirect.sh
+    sed -i "/dibbler-server start/a fi" ${D}/etc/restart_services.sh
+    sed -i "/dibbler-server start/a fi" ${D}/etc/restart_services.sh
+    sed -i "/dibbler-server start/a lighttpd -f \$LIGHTTPD_CONF" ${D}/etc/restart_services.sh
+    sed -i "/dibbler-server start/a sleep 2" ${D}/etc/restart_services.sh
+    sed -i "/dibbler-server start/a killall lighttpd" ${D}/etc/restart_services.sh
+    sed -i "/dibbler-server start/a sed -i '\$d' \$LIGHTTPD_CONF" ${D}/etc/restart_services.sh
+    sed -i "/dibbler-server start/a sed -i '\$d' \$LIGHTTPD_CONF" ${D}/etc/restart_services.sh
+    sed -i "/dibbler-server start/a sed -e '/url.redirect/ s/^#*/#/' -i \$LIGHTTPD_CONF" ${D}/etc/restart_services.sh
+    sed -i "/dibbler-server start/a if [ \$CAPTIVEPORTAL == \"\$\" ] ; then" ${D}/etc/restart_services.sh
+    sed -i "/dibbler-server start/a CAPTIVEPORTAL=\`cat /var/lighttpd.conf | grep captiveportal.php | cut -c1\`" ${D}/etc/restart_services.sh
+    sed -i "/dibbler-server start/a if [ \"\$CaptivePortal_flag\" == 1 ] && [ \"\$1\" == \"false\" ] ; then" ${D}/etc/restart_services.sh
+    sed -i "/dibbler-server start/a fi" ${D}/etc/restart_services.sh
+    sed -i "/dibbler-server start/a lighttpd -f \$LIGHTTPD_CONF" ${D}/etc/restart_services.sh
+    sed -i "/dibbler-server start/a sleep 2" ${D}/etc/restart_services.sh
+    sed -i "/dibbler-server start/a killall lighttpd" ${D}/etc/restart_services.sh
+    sed -i "/dibbler-server start/a fi" ${D}/etc/restart_services.sh
+    sed -i "/dibbler-server start/a echo \"}\" >> \$LIGHTTPD_CONF" ${D}/etc/restart_services.sh
+    sed -i "/dibbler-server start/a echo \"}\" >> \$LIGHTTPD_CONF" ${D}/etc/restart_services.sh
+    sed -i "/dibbler-server start/a echo \"\\\\\$HTTP[\\\\\"host\\\\\"] !~ \\\\\":8080\\\\\" {  \\\\\$HTTP[\\\\\"url\\\\\"] !~ \\\\\"captiveportal.php\\\\\" {  \\\\\$HTTP[\\\\\"referer\\\\\"] == \\\\\"\\\\\" { url.redirect = ( \\\\\".*\\\\\" => \\\\\"http://10.0.0.1/captiveportal.php\\\\\" ) url.redirect-code = 303 }\" >> \$LIGHTTPD_CONF" ${D}/etc/restart_services.sh
+    sed -i "/dibbler-server start/a else" ${D}/etc/restart_services.sh
+    sed -i "/dibbler-server start/a fi" ${D}/etc/restart_services.sh
+    sed -i "/dibbler-server start/a echo \"}\" >> \$LIGHTTPD_CONF" ${D}/etc/restart_services.sh
+    sed -i "/dibbler-server start/a echo \"}\" >> \$LIGHTTPD_CONF" ${D}/etc/restart_services.sh
+    sed -i "/dibbler-server start/a sed -i \"/captiveportal.php/ s/^#*//g\" \$LIGHTTPD_CONF" ${D}/etc/restart_services.sh
+    sed -i "/dibbler-server start/a else" ${D}/etc/restart_services.sh
+    sed -i "/dibbler-server start/a echo \"Already lighttpd was successfully running with captiveportal changes\"" ${D}/etc/restart_services.sh
+    sed -i "/dibbler-server start/a if [ \"\$lighttpd\" == \"\$\" ] ; then" ${D}/etc/restart_services.sh
+    sed -i "/dibbler-server start/a if [ \"\$lighttpd_flag\" == 1 ] ; then" ${D}/etc/restart_services.sh
+    sed -i "/dibbler-server start/a lighttpd=\`cat /var/lighttpd.conf | grep captiveportal.php | cut -c1\`" ${D}/etc/restart_services.sh
+    sed -i "/dibbler-server start/a lighttpd_flag=\`cat /var/lighttpd.conf | grep captiveportal.php | wc -l\`" ${D}/etc/restart_services.sh
+    sed -i "/dibbler-server start/a if [ \"\$CaptivePortal_flag\" == 1 ] && [ \"\$1\" == \"true\" ] ; then" ${D}/etc/restart_services.sh
+    sed -i "/dibbler-server start/a fi" ${D}/etc/restart_services.sh
+    sed -i "/dibbler-server start/a CaptivePortal_flag=1" ${D}/etc/restart_services.sh
+    sed -i "/dibbler-server start/a else" ${D}/etc/restart_services.sh
+    sed -i "/dibbler-server start/a CaptivePortal_flag=0" ${D}/etc/restart_services.sh
+    sed -i "/dibbler-server start/a if [ -f /nvram/reverted ] ; then" ${D}/etc/restart_services.sh
+    sed -i "/dibbler-server start/a LIGHTTPD_CONF=/var/lighttpd.conf" ${D}/etc/restart_services.sh
+    sed -i "/dibbler-server start/a #captiveportal redirection" ${D}/etc/restart_services.sh
+    fi
 ########## ETHWAN Support
    sed -i "s/\"Device.DeviceInfo.X_RDKCENTRAL-COM_Syndication.RDKB_UIBranding.AllowEthernetWAN\"\ :\ \"false\"\ \,/\"Device.DeviceInfo.X_RDKCENTRAL-COM_Syndication.RDKB_UIBranding.AllowEthernetWAN\" : \"true\" ,/g" ${D}/etc/partners_defaults.json
 

meta-rdk-broadband/recipes-ccsp/ccsp/ccsp-webui-jst.bbappend

@@ -0,0 +1,32 @@
+require ccsp_common_genericarm.inc
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+
+EXTRA_OECONF:append = "PHP_RPATH=no"
+
+SRC_URI += "${CMF_GIT_ROOT}/rdkb/devices/raspberrypi/sysint;protocol=${CMF_GIT_PROTOCOL};branch=${CMF_GIT_BRANCH};destsuffix=git/devices;name=webuijst"
+SRCREV_webuijst = "${AUTOREV}"
+SRC_URI_append = " \
+    file://CcspWebUI.sh \
+    file://CcspWebUI.service \
+"
+
+inherit systemd
+
+do_install:append () {
+    install -d ${D}${sysconfdir}
+    install -d ${D}${base_libdir}/rdk/
+    install -d ${D}${systemd_unitdir}/system/
+
+    install -m 755 ${WORKDIR}/CcspWebUI.sh ${D}${base_libdir}/rdk/
+    install -m 644 ${WORKDIR}/CcspWebUI.service ${D}${systemd_unitdir}/system/
+}
+
+
+SYSTEMD_SERVICE:${PN}:append = "CcspWebUI.service"
+SYSTEMD_AUTO_ENABLE:${PN} = "enable"
+
+FILES:${PN}:append = " \
+    ${systemd_unitdir}/system/CcspWebUI.service \
+    ${base_libdir}/rdk/* \
+"

meta-rdk-broadband/recipes-ccsp/ccsp/files/CcspWebUI.service

@@ -0,0 +1,34 @@
+##########################################################################
+# If not stated otherwise in this file or this component's Licenses.txt
+# file the following copyright and licenses apply:
+#
+# Copyright 2019 RDK Management
+#
+# 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.
+##########################################################################
+
+[Unit]
+Description=CcspWebUI service
+After=gwprovethwan.service
+Wants=gwprovethwan.service
+
+[Service]
+Type=forking
+WorkingDirectory=/usr/www2
+ExecStart=/bin/sh /lib/rdk/CcspWebUI.sh
+Restart=always
+StandardOutput=syslog+console
+
+[Install]
+WantedBy=multi-user.target
+

meta-rdk-broadband/recipes-ccsp/ccsp/files/CcspWebUI.sh

@@ -0,0 +1,32 @@
+#!/bin/sh
+##########################################################################
+# If not stated otherwise in this file or this component's Licenses.txt
+# file the following copyright and licenses apply:
+#
+# Copyright 2019 RDK Management
+#
+# 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.
+##########################################################################
+
+
+sleep 10
+
+LIGHTTPD_PROCESS=`ps aux | grep lighttpd | grep -v grep | wc -l`
+
+if [ $LIGHTTPD_PROCESS = 0 ]; then
+        /bin/sh /etc/webgui.sh
+else
+        echo "Lighttpd process was already running"
+        exit 0
+fi
+

meta-rdk-broadband/recipes-ccsp/ccsp/jst.bbappend

@@ -0,0 +1,3 @@
+include ccsp_common_genericarm.inc
+DEPENDS:append = " dbus"
+LDFLAGS:append = " -Wl,--no-as-needed -ldbus-1 -Wl,--as-needed"

meta-rdk-broadband/recipes-ccsp/util/utopia/system_defaults

@@ -491,6 +491,30 @@ $igd_allow_wandisable=0
 $upnp_igd_advr_expire=1800
 $upnp_igd_advr_ttl=5
 
+# Webserver settings
+#   default admin username & password ("admin" in encrypted form)
+#   http_is_admin_default indicates whether the default password is being used
+$http_admin_user=admin
+$http_admin_password=TSLIIHauhEfGE
+$http_admin_port=80
+$http_admin_is_default=1
+
+# Default settings for WebUI
+$user_count=3
+$user_name_1=mso
+$user_name_2=cusadmin
+$user_name_3=admin
+#$user_password_1=password of the day
+$user_password_1=
+$user_password_2=
+$user_password_3=
+$hash_password_1=
+$hash_password_2=
+$hash_password_3=
+$user_insNum_1=1
+$user_insNum_2=2
+$user_insNum_3=3
+
 # User Interface access level
 @lan_ip_webaccess=1
 @cm_ip_webaccess=1
@@ -790,8 +814,8 @@ $dhcpv6spool0option1::bEnabled=1
 $dhcpv6spool0option1::Tag=24
 $dhcpv6spool0option1::PassthroughClient=Device.DHCPv6.Client.1.
 
-$CaptivePortal_Enable=false
-$redirection_flag=false
+$CaptivePortal_Enable=true
+$redirection_flag=true
 
 #CCSP RECOVERY MONITOR
 $ccsp_recovery_enable=1

meta-rdk-broadband/recipes-rdkb/sysint-broadband/sysint-broadband.bbappend

@@ -66,6 +66,7 @@ do_install:append() {
     install -m 0755 ${S}/devicegenericarm/lib/rdk/task_health_monitor.sh ${D}/usr/ccsp/tad
     install -m 0644 ${S}/devicegenericarm/systemd_units/disable_systemd_restart_param.service ${D}${systemd_unitdir}/system
     install -m 0755 ${S}/devicegenericarm/lib/rdk/disable_systemd_restart_param.sh ${D}${base_libdir}/rdk
+    install -m 0755 ${S}/devicegenericarm/lib/rdk/run_rm_key.sh   ${D}${base_libdir}/rdk
 }
 
 

recipes-core/packagegroups/packagegroup-rdk-ccsp-broadband.bbappend

@@ -10,7 +10,6 @@ RDEPENDS_packagegroup-rdk-ccsp-broadband:remove = "rdktelcovoicemanager"
 
 RDEPENDS_packagegroup-rdk-ccsp-broadband:remove = "ccsp-adv-security"
 
-RDEPENDS_packagegroup-rdk-ccsp-broadband:remove = "ccsp-webui-jst"
 RDEPENDS_packagegroup-rdk-ccsp-broadband:remove = "ccsp-webui-php"
 
 RDEPENDS_packagegroup-rdk-ccsp-broadband:remove = "parodus"
@@ -26,4 +25,4 @@ RDEPENDS_packagegroup-rdk-ccsp-broadband:append = "\
 "
 
 # Set the gwprov app for RPi
-GWPROVAPP = "${@bb.utils.contains('DISTRO_FEATURES','rdkb_wan_manager','','ccsp-gwprovapp-ethwan',d)}"
+GWPROVAPP = "${@bb.utils.contains('DISTRO_FEATURES','rdkb_wan_manager','ccsp-gwprovapp','',d)}"