added base64 decode for keyfile
authorft
Fri, 22 Aug 2014 10:27:46 +0200
changeset 24597ff293cbdf
parent 23 7933295dbdca
child 25 25581dcb9e62
added base64 decode for keyfile
src/passwordreceiver.py
     1.1 --- a/src/passwordreceiver.py	Thu Aug 21 17:00:05 2014 +0200
     1.2 +++ b/src/passwordreceiver.py	Fri Aug 22 10:27:46 2014 +0200
     1.3 @@ -5,6 +5,7 @@
     1.4  import netifaces
     1.5  import os
     1.6  import sys
     1.7 +import base64
     1.8  #import logging
     1.9  
    1.10  opensecurity_urls = (
    1.11 @@ -41,7 +42,7 @@
    1.12  
    1.13          if "keyfile" in args:
    1.14              keyfile = open (settings["keyfilepath"], "w+")
    1.15 -            keyfile.write(args["keyfile"])
    1.16 +            keyfile.write(base64.b64decode(args["keyfile"]))
    1.17              keyfile.close()
    1.18              command = [settings["script"], settings["device"], settings["mountpoint"], args["password"], settings["keyfilepath"]]
    1.19          else:
    1.20 @@ -113,7 +114,7 @@
    1.21  
    1.22          if "keyfile" in args:
    1.23              keyfile = open (settings["keyfilepath"], "w+")
    1.24 -            keyfile.write(args["keyfile"])
    1.25 +            keyfile.write(base64.b64decode(args["keyfile"]))
    1.26              keyfile.close()
    1.27              command = [settings["script"], settings["device"], settings["mountpoint"], args["password"], settings["keyfilepath"]]
    1.28          else: