Change PNG generation to using the qrcode library instead of a web service.

Author: tknarr

README.rst

@@ -8,7 +8,7 @@ PyAuth
 .. image:: https://img.shields.io/pypi/pyversions/PyAuth.png
     :target: https://pypi.python.org/pypi/PyAuth/
     :alt: Latest Version
-    
+
 .. image:: https://img.shields.io/github/release/tknarr/PyAuth.png
     :target: https://github.com/tknarr/PyAuth/releases/latest
     :alt: Latest Version
@@ -53,8 +53,8 @@ Prerequisites
   `wxWidgets <http://www.wxwidgets.org/>`_
 * `pyotp 2.0.1 <https://pypi.python.org/pypi/pyotp>`_ or higher
 * `cryptography 1.3 <https://pypi.python.org/pypi/cryptography>`_ or higher
-* `pycrypto 2.6.1 <https://pypi/python.org/pypi/pycrypto>`_ or higher, strictly for
-  decrypting older databases
+* `qrcode 5.3 <https://pypi.python.org/pypi/qrcode>`_ or higher
+* `Pillow 3.4 <https://pypi.python.org/pypi/Pillow>`_ or higher
 
 wxPython isn't automatically pulled in by ``pip`` because the version at PyPI is
 still 2.9. Your distribution probably includes a pre-packaged version, or you can
@@ -103,7 +103,7 @@ Command line:
 * ``-n`` forces the program to display in a normal window without using the
   notification icon. This overrides ``-s`` and ``-m`` and any remembered settings
   for the notification icon.
-    
+
 * ``--icons`` selects a set of icons with the named background (default white).
 
 * ``--logfile`` allows you to set a log file for errors and messages logged by

pyauth/AuthEntryPanel.py

@@ -21,7 +21,7 @@
 import wx
 from AuthenticationStore import AuthenticationEntry
 from Logging import GetLogger
-from qrcode import QrCodeImage, QrCodeFrame
+from QrCode import QrCodeImage, QrCodeFrame
 
 
 class AuthEntryPanel( wx.Panel ):
@@ -389,10 +389,6 @@ def GetCodeString( self, selected ):
     def GetProvisioningUri( self ):
         return self.entry.GetKeyUri( )
 
-    def GetQrCodeUrl( self ):
-        qr = QrCodeImage( self.entry )
-        return qr.GetUrl( )
-
     def GetQrCodeImage( self ):
         qr = QrCodeImage( self.entry )
         return qr.GetImage( )

pyauth/Encryption.py

@@ -26,7 +26,6 @@
 ## along with this program.  If not, see http://www.gnu.org/licenses/
 
 import os
-import string
 import base64
 from cryptography.hazmat.primitives import hashes
 from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes

pyauth/qrcode.py pyauth/QrCode.pypyauth/qrcode.py renamed to pyauth/QrCode.py

@@ -18,11 +18,8 @@
 ## along with this program.  If not, see http://www.gnu.org/licenses/
 
 import wx
-import requests
-import urllib
+import qrcode
 from io import BytesIO
-from AuthenticationStore import AuthenticationEntry
-from Logging import GetLogger
 
 
 class QrCodeImage:
@@ -31,21 +28,12 @@ class QrCodeImage:
     def __init__( self, entry ):
         self.provisioning_uri = entry.GetKeyUri( )
 
-    def GetUrl( self ):
-        return "https://www.google.com/chart?chs=240x240&chld=M|0&cht=qr&chl=" + urllib.quote( self.provisioning_uri )
-
     def GetImage( self ):
-        url = self.GetUrl( )
-        GetLogger( ).debug( "Requesting QR code image from %s", url )
-        resp = requests.get( url )
-        GetLogger( ).debug( "HTTP status: %d", resp.status_code )
-        if resp.status_code == requests.codes.ok:
-            input_strm = BytesIO( resp.content )
-            image = wx.ImageFromStream( input_strm, wx.BITMAP_TYPE_PNG )
-        else:
-            GetLogger( ).error( "HTTP error %d", resp.status_code )
-            GetLogger( ).error( "Error response body:\n%s", resp.text )
-            image = None
+        img = qrcode.make( self.provisioning_uri )
+        strm = BytesIO( )
+        img.save( strm, "PNG" )
+        strm.seek( 0 )
+        image = wx.ImageFromStream( strm, wx.BITMAP_TYPE_PNG )
         return image
 
 

setup.py

@@ -81,10 +81,10 @@
 
     install_requires = [
         # 'wxPython>=3.0',
-        'requests>=2.10',
         'pyotp>=2.0.1',
-        'pycrypto>=2.6.1',
-        'cryptography>=1.3'
+        'cryptography>=1.3',
+        'qrcode>=5.3',
+        'Pillow>=3.4'
     ],
 
     package_data = {