From 45694d8f90308d44fbb0e1e6424bd471ffc99897 Mon Sep 17 00:00:00 2001 From: jgaunt Date: Wed, 4 Mar 2020 12:53:11 -0500 Subject: [PATCH] Update 'freenas_network_unlock.py' --- freenas_network_unlock.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/freenas_network_unlock.py b/freenas_network_unlock.py index 7603980..844c8fc 100644 --- a/freenas_network_unlock.py +++ b/freenas_network_unlock.py @@ -52,10 +52,12 @@ def request(resource, method='GET', data=None): POOLS = request('storage/volume/', 'GET') for pool in POOLS['response']: if pool['is_decrypted'] == False: - recovery_key = open('/mnt/ramfs/{}.recoveryKey'.format(pool['name']),'rb') - recovery_key_binary = recovery_key.read() - recovery_key_string = (base64.b64encode(recovery_key_binary)).decode('ascii') - response = request('storage/volume/{}/unlock/'.format(pool['name']), 'POST', {'recovery_key': '{}'.format(recovery_key_string)}) + #recovery_key = open('/mnt/ramfs/{}.recoveryKey'.format(pool['name']),'rb') + passphrase = open('/mnt/ramfs/{}.password'.format(pool['name']),'r') + #recovery_key_binary = recovery_key.read() + #recovery_key_string = (base64.b64encode(recovery_key_binary)).decode('ascii') + #response = request('storage/volume/{}/unlock/'.format(pool['name']), 'POST', {'recovery_key': '{}'.format(recovery_key_string)}) + response = request('storage/volume/{}/unlock/'.format(pool['name']), 'POST', {'passphrase': '{}'.format(passphrase)}) if response['ok']: logging.info('Pool {} was unlocked successfully'.format(pool['name'])) else: