From 325d4affbde0d16f8af243038e14ca6326bc6d61 Mon Sep 17 00:00:00 2001
From: Patrick McDonagh <pmcdonagh@henry-pump.com>
Date: Wed, 22 Jun 2016 11:47:58 -0500
Subject: [PATCH] Completes POCONSOLE-51. Forces SSL/HTTPS

---
 sampleData.py |  8 ++++----
 tagserver.py  | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/sampleData.py b/sampleData.py
index 1e329d9..de08f1a 100644
--- a/sampleData.py
+++ b/sampleData.py
@@ -15,7 +15,7 @@ import requests
 import json
 
 # DEFAULTS
-web_address = "http://localhost:3000"
+web_address = "https://localhost:3000"
 scan_rate = 30  # seconds
 save_all = "test"  # use True, False, or any string
 
@@ -61,7 +61,7 @@ def main():
     try:
         # Get tags stored in database
         get_tag_request_data = {'where': '{"tag_class": 5}'}
-        get_tag_request = requests.get('{}/tag'.format(web_address), params=get_tag_request_data)
+        get_tag_request = requests.get('{}/tag'.format(web_address), params=get_tag_request_data, verify=False)
         tags = json.loads(get_tag_request.text)
     except Exception, e:
         print("Error getting tags: {}".format(e))
@@ -70,7 +70,7 @@ def main():
 
     try:
         sr_req_data = 'where={"parameter": "scan_rate"}'
-        sr_req = requests.get('{}/config?{}'.format(web_address, sr_req_data))
+        sr_req = requests.get('{}/config?{}'.format(web_address, sr_req_data), verify=False)
         sr_try = json.loads(sr_req.text)
         if len(sr_try) > 0:
             scan_rate = int(sr_try[0]['val'])
@@ -80,7 +80,7 @@ def main():
 
     try:
         sa_req_data = {"where": {"parameter": "save_all"}}
-        sa_req = requests.get('{}/config'.format(web_address), params=sa_req_data)
+        sa_req = requests.get('{}/config'.format(web_address), params=sa_req_data, verify=False)
         sa_try = json.loads(sa_req.text)
         if len(sa_try) > 0:
             if sa_try[0]['val'].lower() == "true":
diff --git a/tagserver.py b/tagserver.py
index c42a697..21f3f9d 100644
--- a/tagserver.py
+++ b/tagserver.py
@@ -14,7 +14,7 @@ import requests
 import json
 
 # DEFAULTS
-web_address = "http://localhost:3000"
+web_address = "https://localhost:3000"
 scan_rate = 30  # seconds
 save_all = "test"  # use True, False, or any string
 plc_handshake_tags = {}
@@ -29,7 +29,7 @@ def main():
     try:
         # Get tags stored in database
         get_tag_request_data = {'where': '{"tag_class": 5}'}
-        get_tag_request = requests.get('{}/tag'.format(web_address), params=get_tag_request_data)
+        get_tag_request = requests.get('{}/tag'.format(web_address), params=get_tag_request_data, verify=False)
         tags = json.loads(get_tag_request.text)
     except Exception, e:
         print("Error getting tags: {}".format(e))
@@ -39,7 +39,7 @@ def main():
     try:
         # Get tags stored in database
 
-        get_device_type_request = requests.get('{}/device_type'.format(web_address))
+        get_device_type_request = requests.get('{}/device_type'.format(web_address), verify=False)
         device_types_json = json.loads(get_device_type_request.text)
         for t in device_types_json:
             device_types[t['id']] = t['dType']
@@ -50,7 +50,7 @@ def main():
 
     try:
         sr_req_data = 'where={"parameter": "scan_rate"}'
-        sr_req = requests.get('{}/config?{}'.format(web_address, sr_req_data))
+        sr_req = requests.get('{}/config?{}'.format(web_address, sr_req_data), verify=False)
         sr_try = json.loads(sr_req.text)
         if len(sr_try) > 0:
             scan_rate = int(sr_try[0]['val'])
@@ -60,7 +60,7 @@ def main():
 
     try:
         sa_req_data = {"where": {"parameter": "save_all"}}
-        sa_req = requests.get('{}/config'.format(web_address), params=sa_req_data)
+        sa_req = requests.get('{}/config'.format(web_address), params=sa_req_data, verify=False)
         sa_try = json.loads(sa_req.text)
         if len(sa_try) > 0:
             if sa_try[0]['val'].lower() == "true":
@@ -74,7 +74,7 @@ def main():
     try:
         # Get tags stored in database
         get_hs_request_data = {'where': '{"tag_class": 6}'}
-        get_hs_request = requests.get('{}/tag'.format(web_address), params=get_hs_request_data)
+        get_hs_request = requests.get('{}/tag'.format(web_address), params=get_hs_request_data, verify=False)
         hs_tags = json.loads(get_hs_request.text)
         if len(hs_tags) > 0:
             for hs in hs_tags: