Changeset 18995 for trunk

Timestamp:

04/10/18 09:38:20 (6 years ago)

Author:

tbretz

Message:

Allow to run without authentication.

File:

• trunk/FACT++/src/rainsensor.cc (modified) (5 diffs)

trunk/FACT++/src/rainsensor.cc

@@ -185 +185 @@
     void PostRequest()
     {
+        const string auth = fAuthentication.empty() ? "" :
+            "Authorization: Basic "+fAuthentication+"\r\n";
+
         const string cmd =
             "GET "+fSite+" HTTP/1.1\r\n"
             "Accept: */*\r\n"
             "Content-Type: application/octet-stream\r\n"
-            "Authorization: Basic "+fAuthentication+"\r\n"
+            +auth+
             "User-Agent: FACT\r\n"
             "Host: www.fact-project.org\r\n"
@@ -287 +290 @@
     void SetAuthentication(const string &user, const string &password)
     {
+        if (user.empty() && password.empty())
+        {
+            fAuthentication = "";
+            return;
+        }
+
         const string auth = user+":"+password;
 
@@ -437 +446 @@
     int EvalOptions(Configuration &conf)
     {
+        const string user = conf.Has("user") ? conf.Get<string>("user") : "";
+        const string pass = conf.Has("password") ? conf.Get<string>("password") : "";
+
         fRain.SetInterval(conf.Get<uint16_t>("interval"));
         fRain.SetDebugTx(conf.Get<bool>("debug-tx"));
@@ -442 +454 @@
         fRain.SetSite(conf.Get<string>("url"));
         fRain.SetEndpoint(conf.Get<string>("addr"));
-        fRain.SetAuthentication(conf.Get<string>("user"), conf.Get<string>("password"));
+        fRain.SetAuthentication(user, pass);
         fRain.StartConnect();
 
@@ -468 +480 @@
         ("no-dim,d",  po_switch(), "Disable dim services")
         ("addr,a",  var<string>("www.magic.iac.es:80"),  "Network address of Cosy")
-        ("url,u",  var<string>("/site/weather/protected/current.json"),  "File name and path to load")
+        ("url,u",  var<string>("/site/weather/rain_current.json"),  "File name and path to load")
         ("quiet,q", po_bool(true),  "Disable printing contents of all received messages (except dynamic data) in clear text.")
         ("interval,i", var<uint16_t>(60), "Interval between two updates on the server in seconds")
         ("debug-tx", po_bool(), "Enable debugging of ethernet transmission.")
         ("debug-rx", po_bool(), "Enable debugging of ethernet receptions.")
-        ("user", var<string>("FACT")->required(), "User name for authentication.")
-        ("password", var<string>()->required(), "Password for authentication.")
+        ("user", var<string>(), "User name for authentication.")
+        ("password", var<string>(), "Password for authentication.")
         ;