Merge pull request #123 from Netflix-Skunkworks/fix-mac-address-parsing

Fix mac address parsing
Netflix-Skunkworks · Apr 8, 2019 · 33a3523 · 33a3523
2 parents 96a1c57 + 2e96c6f
commit 33a3523
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 7 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -58,7 +58,7 @@ stevedore==1.27.0
 treq==17.8.0
 Twisted==17.9.0
 txretry==1.0.1
-git+https://github.com/wrapp/txwebretry.git@df5014019cf3a5d501bc755b9ce46509c1b31351#egg=txwebretry
+git+https://github.com/wrapp/txwebretry.git#egg=txwebretry
 uritemplate==3.0.0
 urllib3==1.22
 validate-email==1.3

diff --git a/setup.cfg b/setup.cfg
@@ -11,7 +11,7 @@ replace = version='{new_version}'
 universal = 1
 
 [flake8]
-ignore = E111,E114,E121,E125,E128
+ignore = E111,E114,E121,E125,E128,W504
 exclude = .git,__pycache__,*.pyc,*.pyo,.tox,.eggs,*.egg-info,.ropeproject,scratch
 max-line-length = 100
 doctests = True

diff --git a/setup.py b/setup.py
@@ -128,7 +128,7 @@ def parse_file(filename, encoding='utf-8'):
   install_requires=install_requires,
   dependency_links=[
     'git+https://github.com/duosecurity/duo_client_python.git@1cc71f80927b02e75773094c9dd77af1fc8e4064.zip#egg=duo_client-3.0',  # noqa
-    'git+https://github.com/wrapp/txwebretry.git@df5014019cf3a5d501bc755b9ce46509c1b31351#egg=txwebretry-0.1.1',  # noqa
+    'git+https://github.com/wrapp/txwebretry.git#egg=txwebretry',  # noqa
   ],
   entry_points={
     'console_scripts': [

diff --git a/stethoscope/csrf.py b/stethoscope/csrf.py
@@ -37,7 +37,7 @@
 
 def generate_token():
   salt = str(urandom.randrange(0, _MAX_CSRF_KEY)).encode('utf-8')
-  return hashlib.sha1(salt).hexdigest()
+  return hashlib.sha256(salt).hexdigest()
 
 
 def _same_origin(url1, url2):

diff --git a/stethoscope/validation.py b/stethoscope/validation.py
@@ -16,7 +16,7 @@
 
 logger = logbook.Logger(__name__)
 
-MACADDR_PATTERN = re.compile(r'^' + r'\:?'.join([r'([0-9A-F]{1,2})'] * 6) + r'$', re.IGNORECASE)
+MACADDR_PATTERN = re.compile(r'^([0-9A-F]{2}[:-]?){5,7}([0-9A-F]{2})$', re.IGNORECASE)
 
 
 def _is_valid_macaddr(addr):

diff --git a/tests/test_validation.py b/tests/test_validation.py
@@ -84,6 +84,14 @@ def test_valid_macaddr(self):
     self.assertEqual(request.code, 200)
     self.assertEqual(request.getWrittenData(), six.b(json.dumps("00:00:DE:CA:FB:AD")))
 
+  def test_valid_long_macaddr(self):
+    request = requestMock(b"/api/00:00:DE:CA:FB:AD:AB:CD")
+    deferred = _render(KleinResource(self.app), request)
+
+    self.assertEqual(self.successResultOf(deferred), None)
+    self.assertEqual(request.code, 200)
+    self.assertEqual(request.getWrittenData(), six.b(json.dumps("00:00:DE:CA:FB:AD:AB:CD")))
+
 
 class ValidateEmailTestCase(HTMLEscapeMixin, ValidationBase):
 

diff --git a/tox.ini b/tox.ini
@@ -14,13 +14,13 @@ envlist =
 
 [travis]
 python =
-  2.7: py27, lint, bandit, flake8, docs
+  2.7: py27, lint, bandit, flake8
   3.4: py34
   3.5: py35
   3.6: py36
 
 [testenv]
-install_command = pip install --process-dependency-links {opts} {packages}
+install_command = pip install {opts} {packages}
 deps =
   -rrequirements.txt
 setenv =