pywb-proxy: fixes for no mementos, add new sha256 pywb-ca.pem

rename runlocal.sh -> run-local.sh

pywb/archivereplayview.py

@@ -182,6 +182,7 @@ def load_archive_info_json(self, url):
         except Exception as e:
             logging.debug(e)
             logging.debug('Proceeding without json archive info')
+            return
 
         archives = json.loads(stream.read())
         for arc in archives:

pywb/ca/pywb-ca.pem

@@ -1,46 +1,47 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpgIBAAKCAQEAvHW2mCI9BMi983hV4gZSzUEuMS60qkogJ4LuPEZCAejDyoOT
-FfGFtNEWb5+ckUNv2U+NBWcEpfnCY9Wyv45c++ApyttcT5i0svZ7AoYf+ixxTzFe
-1mzvRNOQKjRJwa4um72LSkhUnK9wbBXDf2GZaP++2nlyVfKRu7QfHN/D1hl5NMtA
-48h/O4YIjUZ7dF4YO0BclXmz/l/3L5CRDqS4VZX/DcpUIApn6MrQzdMm/9NnR93C
-Wf7bM4Ioe3j4bS8ig4FaUTmPURWQcd92sLRaUprnInfU6ZW41mcinWPoXzBBU2FB
-gML43msWvaaFfunntByfRzCM7nxQ9uMOvz5nIQIDAQABAoIBAQCvWNLwkAK4HdLm
-4pL9/yYxhbDl3/AG9XsfaCojeLdXsWviVDOZWiQujdBTQW3alqVNyz+JxEVF7LGa
-VC3BH0OSswoPjbRA9vNCBCWFvqeoDIvMxEHaPncNUc80BXyOsXL6QwyDq/LV6kIu
-vr0sGvIzCKlZ+1+Pamd//uJn6ib7XxTnle1S7mVqWlikEHDNYFXi8dNa+5bGYxBC
-AITGKu2UvITROgmgOsfyXJ5ECaT57BaW0uS5xPIt7hzazTwZNa7uw8316mPbdYB7
-Qjps2GAwtguRXAwgToOnKMdv2g9A+9bcHSAp5MGSPi8Ff2iv464JLxuSvxtzbboN
-Iv+3QbjBAoGBAOdKcSmAuDttMrpdqPgUnhU+jJcHGrNpSNkHRZY4z6dXHOffKr02
-TnWSoxo9b95zQhv709B/UBPx4Z5e1N8yTD3mtZvsy3Qlmx1CSm8PNTFZALmx+lAn
-gknaehCX2k2XM1owXzGb4Jt8xdoNVYYLPAKZpqeL9a9DORd3leA+Icl5AoGBANCX
-47h1rycGAAg2DQqsbWNP1HIi+ozrUNVYjrqSulQUhJQ4pklSss5htNyX/LTHbF4u
-bi1Mp80M7+nd/liBR7ovzgdcKYPjhrndhfe158+gV1OkbMlLP6VjF+c3nwcysiCm
-RshwWRlpL8et28wWrDYz3CWlBsXC+DyWedXfdEjpAoGBALuVBHJEkyafSaUckQ2i
-qxNPx3Y1rNIVcZ+S5j0PllqBrE/iDyemA7wXUXDWowQnNla7xu4yUx/Z7MIk50Cd
-6nfJxUDQq7FnToZMXVH1Y47CQHRahEi9wk1jg9wxTDvhhSSAVrRFV8TDTTOr3ND6
-C5GQTDlWqcubGZKOyl80BPMBAoGBALeqVccwUAXTQan5NaiFRFfijZPl+qij9eu0
-axAaa9fmrQn5i2kaWPhhjaeCZ+8hfOi8hyR5z3I8Bu7sGa0CQA7PUuCmJKPNbe4w
-AGqpD7CAZQPvzh27lRHh28Up82uaFr+qyL5qNfmq5XgzPEpKWF3tcdTvprPwxTRL
-5oELnM8pAoGBAMhEnLH+WOzE/H0AM3GxbEoM3TL3coNfVCsKhm+tngJH7gKOLlCL
-h9PtQiYs33tfKD0nWxzJdyjrXzfJIee8ijflkzQ2E21IqGkMVwGZm/mVLq+SzvG6
-eJ1BFKSRUPk+jIOcY0TfDRbw+sBeM/LhbFTONG/UnH1ZOxOUiWNzzfES
------END RSA PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQCsgeO/hyAm02BG
+EWIKw+86B7f5Tlap1fuYSoD+KC7UCCTtsNVDPACqsFF3UPVpIbFD5GB2++LFWmtF
+c7gGhMwjZ2XR/rw/z+j+4nOI54enJXGurlxjg0+JxWc/aatd9lyVx36uxLM8+Ssu
+49PuF/bqt7xwluSDkRmVcOcZcyqW/8HNNXkmJY03RuUKtfrNuQX6rJouxPfjBC4j
+duYbJy/AUHU6n3ZoamYBYw859X7t59kLvkQj2fSj/1DD7mK1beZ1kpLlydg0PI2A
+Nw09zMb1O0Vhjm/sREfEcJHxkOLR+LW6lgSBI5Zxc3M3Vl8kMc/N4AwWjrrkvHd7
+JdMcwIOjAgMBAAECggEBAJm0mlMbeUBe8tc7wdnJvyw7mGcgsANf0G9fYxQShbcT
+EqRe/YaMviNYOx5PGnt0M9hEctdRlDs4V4BonT3hsWqSRJ0Zlm5dOENzTnJbqfj6
+WhLE9TkN1R7yrw5HfxOX4eLrACuExBe+BAYhpcHtxGpbECJZsH6yGNOY57E7dmVX
+QqGNAKJkSqU2UI50979tpFFEA3bA82VSjvf531MARrRex/cJeBGD1cx68aAf68IL
+2RYgR6nSXKCa9SZ9I/VfrB1gCFybkVMO4OfQOXsT1ACa+46ngARPnygf3JTEaGQ1
+8iBY1cfE4iY4MpxMlf/Hex9jk3qerZDOAJjzeuUijtECgYEA13Npy1/TPaWL+xtu
+jb9iSCDx/JS4AFYQdN8zEVfYHYSMSX6L1weET0sp+kwQgGvotfAoYiFaWyaaMN3O
+12etMFK8TCvZblFVyOKY0XIITvcY7zruX7F1HM2GMhjxMWZPbMHtzcfW8gHU9SCN
+27U57GFtazoE28ygTC90UJ5mNr0CgYEAzPltiSUA3C8qIOFo+vb5h6SBb6dpSyuH
+3fDi2d7wTId6/c794/vmfH1Zrkk95MhV3830x7SKtOl2dcZ+5PsW50R6sgbPBnjD
+fFQ+CK5zQSoTPL4kDeX0MpFH6JkqT3hh13oK5/VAkbGkDD4nu5vNLyP1nmxQ4OTW
+JnpUhoht+d8CgYEA0wrWosSm40f6KmrgjDDgUM8Uutnis1GapSDNoTtvEtr3oDY5
+PNS8If/6ipdfwqvxM+afaCBLpeXWO+/J4O5Jk4A3ulVpkspRQYnVL7SHtvIMlqof
+PdVSZnhb707HVCBnxJziGCScxEpPFB5jVsfaiVWWHOakQ7nZe0cwpJfEf/ECgYEA
+moQ9KnGWoGV9oKPL+8RKfxJn8L+HBH+gQJLir9L72vUWplZv1nmCWr4z6MqVue27
+rqcXq6RSG+cSwd4MspkFvvlEdQfk8MAAvazTxr+barhJIDVGAKQk3inex10PJDFf
+sIvzxMCBGFONkx0X3rmoh6zX78E/hwl61i7JoVEfdokCgYAqEzOD0aEMndF0MCSB
+mQH8XsDFqRofC54Xy8MAJUZoCN9Wowfh9+qvukuWgEsDPBXPjLGfxUTEE2OwDR0Q
+uBRbY+Xcs5RsPO85HhS1jbRUrElSxwkcc6njVFw6Z8PE+2y/OUYwqEiCI8ug8LEk
+5kMjh8gZhn0pGuliWr5BK/Dxgg==
+-----END PRIVATE KEY-----
 -----BEGIN CERTIFICATE-----
-MIIDEjCCAfqgAwIBAgIJAJoFai6O2QahMA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
-BAMTGnB5d2IgaHR0cHMgcHJveHkgcmVwbGF5IENBMB4XDTE1MDgxNzAzNDM0OVoX
-DTI1MDgxNDAzNDM0OVowJTEjMCEGA1UEAxMacHl3YiBodHRwcyBwcm94eSByZXBs
-YXkgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC8dbaYIj0EyL3z
-eFXiBlLNQS4xLrSqSiAngu48RkIB6MPKg5MV8YW00RZvn5yRQ2/ZT40FZwSl+cJj
-1bK/jlz74CnK21xPmLSy9nsChh/6LHFPMV7WbO9E05AqNEnBri6bvYtKSFScr3Bs
-FcN/YZlo/77aeXJV8pG7tB8c38PWGXk0y0DjyH87hgiNRnt0Xhg7QFyVebP+X/cv
-kJEOpLhVlf8NylQgCmfoytDN0yb/02dH3cJZ/tszgih7ePhtLyKDgVpROY9RFZBx
-33awtFpSmucid9TplbjWZyKdY+hfMEFTYUGAwvjeaxa9poV+6ee0HJ9HMIzufFD2
-4w6/PmchAgMBAAGjRTBDMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYDVR0PAQH/BAQD
-AgEGMB0GA1UdDgQWBBQ1HAIib+1bioR2Yi6GwPCP30r1WDANBgkqhkiG9w0BAQUF
-AAOCAQEAbuNML1eRcJ5Xr+sRHuL9VtjycxOmmaV6KbTO2Z2k7XqniU1TO3xv16nk
-91oEIoV5by4Lo+lIIh4UsC7o2aGVT7fT01BK6vh3ewEVDGGTSIrIfDE4VsYydEXa
-tInKoEJPG6d9Q4G42LPh7HSjPvdm+q3fsbArhufd618bZX+HMk9TnZfwamEMlEZk
-4O649J8Ur+qUdKoPI+KMMWtk128OAUdtI1VkJTERgvSya3NU0Qzw8ACy9Y9dBUE0
-UNJD8TiwCUrkIPhT6ScM7e+Fsv+c9yvBnaPgNK5AHG8dOk4BLQjf8ijp1R+ZN1vw
-FhgToH8rgW6nVF1iSo8YtEo+CbPEww==
+MIIDETCCAfmgAwIBAgIIfZKyi7svz/AwDQYJKoZIhvcNAQELBQAwJTEjMCEGA1UE
+AwwacHl3YiBodHRwcyBwcm94eSByZXBsYXkgQ0EwHhcNMTUxMTEwMDgyNTM4WhcN
+MjUxMTA3MDgyNTM4WjAlMSMwIQYDVQQDDBpweXdiIGh0dHBzIHByb3h5IHJlcGxh
+eSBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKyB47+HICbTYEYR
+YgrD7zoHt/lOVqnV+5hKgP4oLtQIJO2w1UM8AKqwUXdQ9WkhsUPkYHb74sVaa0Vz
+uAaEzCNnZdH+vD/P6P7ic4jnh6clca6uXGODT4nFZz9pq132XJXHfq7Eszz5Ky7j
+0+4X9uq3vHCW5IORGZVw5xlzKpb/wc01eSYljTdG5Qq1+s25Bfqsmi7E9+MELiN2
+5hsnL8BQdTqfdmhqZgFjDzn1fu3n2Qu+RCPZ9KP/UMPuYrVt5nWSkuXJ2DQ8jYA3
+DT3MxvU7RWGOb+xER8RwkfGQ4tH4tbqWBIEjlnFzczdWXyQxz83gDBaOuuS8d3sl
+0xzAg6MCAwEAAaNFMEMwEgYDVR0TAQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8EBAMC
+AQYwHQYDVR0OBBYEFAYZ6wWLjKoUBFzcY1T3Bkes8EnjMA0GCSqGSIb3DQEBCwUA
+A4IBAQCRcUxB/L1RYHjIi2eUUWCbcl7Qf1M6paIZKOv87ddwnk9zh0DcrutNuIoY
+ii4+VheKc//f6+UkCimrXvE9bf/5C6Pjsi9lbSycIsaORVt+zg7aTEexdQuP0Ha9
+8Crp/oiYwTqEGAHJH7H40b3M3eCpQRqGAjUZb7M1oLXO28PbmLdgtqU9zYlxjhxt
+PCFdtYFq0cX3aaMpiceUXRioWqrKOtYibXGOWuVimuAXPpOyGCpiLyLghz/XznVH
+CQHxkkJlkkMpOErL4dlcld5cuPmCRZd0vzuZV4/Tfr9v5KjYvPL+yWsoiIstVpuI
+gjkCSP7We6LJP9yimoj2k8lROJks
 -----END CERTIFICATE-----

pywb/mementoquery.py

@@ -41,11 +41,12 @@ def __init__(self, paths):
     def timegate_query(self, timestamp, url):
         url = urllib.quote(url, ':/')
         full = self.api_endpoint + timestamp + '/' + url
+        r = None
         try:
             r = self.session.get(full)
             result = r.json()
         except Exception as e:
-            if r.status_code != 404:
+            if not r or r.status_code != 404:
                 import traceback
                 traceback.print_exc(e)
 
@@ -57,18 +58,21 @@ def timegate_query(self, timestamp, url):
     def timemap_query(self, url, closest='1'):
         url = urllib.quote(url, ':/')
         full = self.timemap_endpoint + closest + '/' + url
+        r = None
         try:
             r = self.session.get(full)
             result = r.json()
         except Exception as e:
             logging.debug(e)
-            if r.status_code == 503:
+            if r and r.status_code == 503:
                 msg = 'No Mementos Currently Available: <br/>'
                 msg += r.text
-            elif r.status_code == 404:
+            elif r and r.status_code == 404:
                 return {"list": []}
-            else:
+            elif r:
                 msg = 'Unknown response with: ' + str(r.status_code)
+            else:
+                msg = 'No response'
 
             raise NotFoundException(msg, url=url)
 

run-local.sh

@@ -0,0 +1,4 @@
+#export ARCHIVE_JSON=http://webenact.rhizome.org/collinfo.json
+export ARCHIVE_JSON=/archives.json
+docker-compose --x-networking build
+docker-compose --x-networking up -d