From 9cc67f45259e9bc5f9e7d20f861237039864c95d Mon Sep 17 00:00:00 2001
From: shadeofblue <blue@golem.network>
Date: Thu, 4 Apr 2019 11:37:07 +0200
Subject: [PATCH 1/2] fix "unacceptable" characters ;p + tests

---
 golem/TERMS.html          | 18 +++++++++---------
 tests/golem/test_terms.py | 30 ++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/golem/TERMS.html b/golem/TERMS.html
index 46d43f4e79..4a5ffe6186 100644
--- a/golem/TERMS.html
+++ b/golem/TERMS.html
@@ -370,7 +370,7 @@ <h6>External Network Monitor</h6>
     contribute certain information about his or her node and the usage of the
     application to the external network monitor. If the user decides to opt-in
     to contribute network statistics to the Company, the following information
-    relating to the user’s use of the application (“External Statistics”) will
+    relating to the user's use of the application ("External Statistics") will
     be transferred to the Company and published on
     <a href="https://stats.golem.network/show">https://stats.golem.network/show</a>:
 </p>
@@ -422,7 +422,7 @@ <h6>External Network Monitor</h6>
 </p>
 <p>
     The processing of the information by storing and publishing the External
-    Statistics on the external network monitor is based on the user’s consent
+    Statistics on the external network monitor is based on the user's consent
     pursuant to Article 6(1) lit. a GDPR. The user shall have the right to
     withdraw his or her consent at any time. If the user wishes to end his or
     her contribution of External Statistics to the external network monitor,
@@ -447,7 +447,7 @@ <h6>Internal Network Monitor</h6>
     contribute certain information about his or her node and the usage of the
     application to the internal network monitor. If the user decides to opt-in
     to contribute network statistics to the Company, the following information
-    relating to the user’s use of the application (“Internal Statistics”)
+    relating to the user's use of the application ("Internal Statistics")
     will be transferred to the Company and stored on its internal servers:
 </p>
 <ul>
@@ -497,7 +497,7 @@ <h6>Internal Network Monitor</h6>
 </p>
 <p>
     The processing of the information by storing the Internal Statistics on
-    the internal network monitor is based on the user’s consent pursuant to
+    the internal network monitor is based on the user's consent pursuant to
     Article 6(1) lit. a GDPR. The user shall have the right to withdraw his or
     her consent at any time. If the user wishes to end his or her contribution
     of information to the network monitor, he or she can opt out by using the
@@ -511,7 +511,7 @@ <h6>Sentry Service for Error Tracking</h6>
     The Company uses an open-source error tracking service called Sentry that
     is offered by Functional Software, Inc. domiciled in San Francisco and
     provides real-time error tracking for web applications Sentry
-    (“Sentry Sentry”). The information collected by the Sentry Service and
+    ("Sentry Sentry"). The information collected by the Sentry Service and
     provided to the Company gives the Company the insight needed to reproduce
     and fix crashes that happen in the Golem Network.
 </p>
@@ -520,11 +520,11 @@ <h6>Sentry Service for Error Tracking</h6>
     be asked during the installation procedure whether he or she wishes to
     contribute information about errors happening in his or her node to the
     Sentry Service, including the node name. If the user decides to opt-in to
-    contribute such error information, all errors that happen in the user’s
+    contribute such error information, all errors that happen in the user's
     nodes as well as the name of the node are automatically sent to the Company
-    (“Error Information”). All other data related to the error is filtered and
+    ("Error Information"). All other data related to the error is filtered and
     encrypted so that the Company is not able to access it. The Error
-    Information sent to the Company is subsequently stored on the Company’s
+    Information sent to the Company is subsequently stored on the Company's
     servers in the form of logs.
 </p>
 <p>
@@ -537,7 +537,7 @@ <h6>Sentry Service for Error Tracking</h6>
 </p>
 <p>
     The processing of the information by storing the Error Information on the
-    servers of the Company is based on the user’s consent pursuant to
+    servers of the Company is based on the user's consent pursuant to
     Article 6(1) lit. a GDPR. The user shall have the right to withdraw his or
     her consent at any time. If the user wishes to end his or her contribution
     of information to the network monitor, he or she can opt out by using the
diff --git a/tests/golem/test_terms.py b/tests/golem/test_terms.py
index 590edaba78..1833965ad6 100644
--- a/tests/golem/test_terms.py
+++ b/tests/golem/test_terms.py
@@ -1,4 +1,6 @@
 import pathlib
+import re
+import unittest
 from unittest.mock import patch
 
 from faker import Faker
@@ -64,3 +66,31 @@ def test_show(self, read_mock):
         """
         read_mock.return_value = content
         self.assertEqual(self.terms.show(), content)
+
+
+class TermsOfUseContentsTest(unittest.TestCase):
+    def assertContentsValid(self, contents):
+        matched = re.search(
+            "(["
+            "^a-zA-Z0-9_"
+            "\\n\\<\\>\\/\\.\\:\\\"\\=\\x20\\(\\)\\,\\;\\'\\-\\%"
+            "])",
+            contents, flags=re.DOTALL)
+
+        try:
+            bad_char = matched.group(1)
+        except AttributeError:
+            bad_char = ''
+
+        self.assertFalse(
+            matched,
+            msg="Found unacceptable character {} ({})".format(
+                bad_char, bad_char.encode('utf-8').hex()
+            )
+        )
+
+    def test_tos_contents_valid(self):
+        self.assertContentsValid(terms.TermsOfUse.show())
+
+    def test_concent_tos_contents_valid(self):
+        self.assertContentsValid(terms.ConcentTermsOfUse.show())

From fa341aebcbfed475587878bd354b406b3f62d3a1 Mon Sep 17 00:00:00 2001
From: shadeofblue <blue@golem.network>
Date: Thu, 4 Apr 2019 11:42:39 +0200
Subject: [PATCH 2/2] optimize the pattern, thx @jiivan

---
 tests/golem/test_terms.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/tests/golem/test_terms.py b/tests/golem/test_terms.py
index 1833965ad6..f0cfce1c2d 100644
--- a/tests/golem/test_terms.py
+++ b/tests/golem/test_terms.py
@@ -71,10 +71,7 @@ def test_show(self, read_mock):
 class TermsOfUseContentsTest(unittest.TestCase):
     def assertContentsValid(self, contents):
         matched = re.search(
-            "(["
-            "^a-zA-Z0-9_"
-            "\\n\\<\\>\\/\\.\\:\\\"\\=\\x20\\(\\)\\,\\;\\'\\-\\%"
-            "])",
+            r"([^a-zA-Z0-9_\n\<\>\/\.\:\"\=\x20\(\)\,\;\'\-\%])",
             contents, flags=re.DOTALL)
 
         try: