From 378752619a6a659b7879f680ef3b7057af793521 Mon Sep 17 00:00:00 2001
From: Shingo Kitagawa <shingogo@hotmail.co.jp>
Date: Wed, 15 Jul 2020 02:49:59 +0900
Subject: [PATCH 1/2] add basic authentication in roswww

---
 .../jsk_robot_startup/lifelog/app_manager.launch          | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/jsk_robot_common/jsk_robot_startup/lifelog/app_manager.launch b/jsk_robot_common/jsk_robot_startup/lifelog/app_manager.launch
index ed1cc38888..79733ff2a6 100644
--- a/jsk_robot_common/jsk_robot_startup/lifelog/app_manager.launch
+++ b/jsk_robot_common/jsk_robot_startup/lifelog/app_manager.launch
@@ -11,6 +11,12 @@
        doc="launch roswww server if true"/>
   <arg name="roswww_port" default="8000"
        doc="port number for roswww server"/>
+  <arg name="basic" default="false"
+       doc="enable basic authentication" />
+  <arg name="basic_yaml" default="/var/lib/robot/roswww_basic_keys.yaml"
+       doc="basic yaml file path" />
+  <arg name="basic_flag" value="--basic $(arg basic) --basic-yaml $(arg basic_yaml)" if="$(arg basic)" />
+  <arg name="basic_flag" value="" unless="$(arg basic)" />
 
   <arg name="remote" default="false"
        doc="set true with valid 'machine' argument"/>
@@ -43,7 +49,7 @@
   <node if="$(arg launch_roswww)"
         name="roswww" pkg="roswww" type="webserver.py"
         output="screen" machine="$(arg machine)" respawn="$(arg respawn)"
-        args="--name roswww --webpath www --cached true
+        args="--name roswww --webpath www --cached true $(arg basic_flag)
               --port $(arg roswww_port) --start_port $(arg roswww_port) --end_port $(arg roswww_port)"/>
 
   <!--

From cf1e4490d4e63d6ff5d14f085bbb82a8f3918d3d Mon Sep 17 00:00:00 2001
From: Shingo Kitagawa <shingogo@hotmail.co.jp>
Date: Wed, 15 Jul 2020 02:53:24 +0900
Subject: [PATCH 2/2] add basic authentication in fetch roswww

---
 jsk_fetch_robot/jsk_fetch_startup/launch/fetch_bringup.launch | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/jsk_fetch_robot/jsk_fetch_startup/launch/fetch_bringup.launch b/jsk_fetch_robot/jsk_fetch_startup/launch/fetch_bringup.launch
index 30e29fd74f..07101fd370 100644
--- a/jsk_fetch_robot/jsk_fetch_startup/launch/fetch_bringup.launch
+++ b/jsk_fetch_robot/jsk_fetch_startup/launch/fetch_bringup.launch
@@ -79,6 +79,8 @@
     <arg name="use_applist" value="true" />
     <arg name="applist" value="$(find jsk_fetch_startup)/apps"/>
     <arg name="respawn" value="false" />
+    <arg name="basic" value="true" />
+    <arg name="basic_yaml" value="/var/lib/robot/roswww_basic_keys.yaml" />
   </include>
 
   <!-- downsample / throttle sensor data -->