Blame fish-webconfig-CVE-2014-2914-followup-4.patch
|
Andy Lutomirski |
3386c6 |
commit a7f1e81e6ac23fe4b6fd86023681e2975703078d
|
|
Andy Lutomirski |
3386c6 |
Author: Andy Lutomirski <luto@amacapital.net>
|
|
Andy Lutomirski |
3386c6 |
Date: Mon Aug 11 18:18:21 2014 -0700
|
|
Andy Lutomirski |
3386c6 |
|
|
Andy Lutomirski |
3386c6 |
webconfig: Convert authkey to hex correctly
|
|
Andy Lutomirski |
3386c6 |
|
|
Andy Lutomirski |
3386c6 |
diff --git a/share/tools/web_config/webconfig.py b/share/tools/web_config/webconfig.py
|
|
Andy Lutomirski |
3386c6 |
index 5c7d2b9..43d2ced 100755
|
|
Andy Lutomirski |
3386c6 |
--- a/share/tools/web_config/webconfig.py
|
|
Andy Lutomirski |
3386c6 |
+++ b/share/tools/web_config/webconfig.py
|
|
Andy Lutomirski |
3386c6 |
@@ -17,7 +17,7 @@ else:
|
|
Andy Lutomirski |
3386c6 |
from urllib.parse import parse_qs
|
|
Andy Lutomirski |
3386c6 |
import webbrowser
|
|
Andy Lutomirski |
3386c6 |
import subprocess
|
|
Andy Lutomirski |
3386c6 |
-import re, socket, os, sys, cgi, select, time, glob, random, string
|
|
Andy Lutomirski |
3386c6 |
+import re, socket, os, sys, cgi, select, time, glob, random, string, binascii
|
|
Andy Lutomirski |
3386c6 |
try:
|
|
Andy Lutomirski |
3386c6 |
import json
|
|
Andy Lutomirski |
3386c6 |
except ImportError:
|
|
Andy Lutomirski |
3386c6 |
@@ -654,7 +654,7 @@ where = os.path.dirname(sys.argv[0])
|
|
Andy Lutomirski |
3386c6 |
os.chdir(where)
|
|
Andy Lutomirski |
3386c6 |
|
|
Andy Lutomirski |
3386c6 |
# Generate a 16-byte random key as a hexadecimal string
|
|
Andy Lutomirski |
3386c6 |
-authkey = hex(os.urandom(16))[2:]
|
|
Andy Lutomirski |
3386c6 |
+authkey = binascii.b2a_hex(os.urandom(16))
|
|
Andy Lutomirski |
3386c6 |
|
|
Andy Lutomirski |
3386c6 |
# Try to find a suitable port
|
|
Andy Lutomirski |
3386c6 |
PORT = 8000
|