DXE-884 further .edgerc validation

akamai · Apr 7, 2022 · 17b2e88 · 17b2e88
1 parent d12c143
commit 17b2e88
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 3 deletions.
diff --git a/httpie_edgegrid.py b/httpie_edgegrid.py
@@ -123,12 +123,12 @@ def get_auth(self, username: str = None, password: str = None):
 
         try:
             rc = EdgeRc(rc_path)
-        except configparser.MissingSectionHeaderError as e:
+        except (configparser.DuplicateSectionError, configparser.MissingSectionHeaderError, UnicodeDecodeError):
             err_msg = '''
 ERROR: {0} is not a valid .edgerc file
 ERROR: Please generate credentials for the script functionality
 ERROR: and run 'python gen_edgerc.py %s' to generate the credential file
-'''.format(e.source)
+'''.format(rc_path)
             sys.stderr.write(err_msg)
             sys.exit(2)
 

diff --git a/test/test_httpie_edgegrid.py b/test/test_httpie_edgegrid.py
@@ -40,12 +40,24 @@ def test_bad_rc_path(self):
             self._test_case("https://localhost/", self._host, "default")
         self.assertEqual(1, err_msg.exception.code)
 
-    def test_bad_rc_file(self):
+    def test_bad_rc_file_format(self):
         with self.assertRaises(SystemExit) as err_msg:
             os.environ["RC_PATH"] = normalize_path('test_httpie_edgegrid.py')
             self._test_case("https://localhost/", self._host, "default")
         self.assertEqual(2, err_msg.exception.code)
 
+    def test_duplicated_rc_file_section(self):
+        with self.assertRaises(SystemExit) as err_msg:
+            os.environ["RC_PATH"] = normalize_path('testfiles/sample_edgerc_duplicated_section')
+            self._test_case("https://localhost/", self._host, "default")
+        self.assertEqual(2, err_msg.exception.code)
+
+    def test_binary(self):
+        with self.assertRaises(SystemExit) as err_msg:
+            os.environ["RC_PATH"] = normalize_path('testfiles/binary')
+            self._test_case("https://localhost/", self._host, "default")
+        self.assertEqual(2, err_msg.exception.code)
+
     def test_bad_rc_entry(self):
         with self.assertRaises(SystemExit) as err:
             self._test_case("https://localhost/", self._host, "not_default")

diff --git a/test/testfiles/binary b/test/testfiles/binary
diff --git a/test/testfiles/sample_edgerc_duplicated_section b/test/testfiles/sample_edgerc_duplicated_section
@@ -0,0 +1,14 @@
+[default]
+host = xxxx-xxxxxxxxxxxxxxxx-xxxxxxxxxxxxxxxx.luna.akamaiapis.net/
+client_token = xxxx-xxxxxxxxxxxxxxxx-xxxxxxxxxxxxxxxx
+client_secret = xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
+access_token = xxxx-xxxxxxxxxxxxxxxx-xxxxxxxxxxxxxxxx
+max_body = 131072
+
+[default]
+host = xxxx-xxxxxxxxxxxxxxxx-xxxxxxxxxxxxxxxx.luna.akamaiapis.net/
+client_token = xxxx-xxxxxxxxxxxxxxxx-xxxxxxxxxxxxxxxx
+client_secret = xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
+access_token = xxxx-xxxxxxxxxxxxxxxx-xxxxxxxxxxxxxxxx
+max_body = 131072
+