get_private_keys: do not try to read sockets #147

sebcode · 2019-01-20T13:21:27Z

I store my ControlMaster sockets in ~/.ssh/ due to ControlPath ~/.ssh/%r@%h:%p in my ssh config. While trying to read private key files, Vorta stumbled upon these sockets and crashed on startup:

  File "/Users/seb/.pyenv/versions/3.6.8/lib/python3.6/site-packages/paramiko/pkey.py", line 278, in _read_private_key_file
    with open(filename, "r") as f:
OSError: [Errno 102] Operation not supported on socket: '/Users/seb/.ssh/seb@asdf'

ThomasWaldmann · 2019-01-20T13:35:52Z

src/vorta/utils.py

@@ -84,6 +84,8 @@ def get_private_keys():
    available_private_keys = []
    if os.path.isdir(ssh_folder):
        for key in os.listdir(ssh_folder):
+            if not os.path.isfile(os.path.join(ssh_folder, key)):


there is another join() some lines below, so it would be better to just compute it once.

ThomasWaldmann

lgtm

m3nu · 2019-01-20T14:33:39Z

Thanks for handling this case @sebcode!

get_private_keys: do not try to read sockets

184920f

ThomasWaldmann reviewed Jan 20, 2019

View reviewed changes

compute path to key file only once

d53e2a7

ThomasWaldmann approved these changes Jan 20, 2019

View reviewed changes

m3nu merged commit d3dbd4d into borgbase:master Jan 20, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

get_private_keys: do not try to read sockets #147

get_private_keys: do not try to read sockets #147

sebcode commented Jan 20, 2019

ThomasWaldmann Jan 20, 2019

ThomasWaldmann left a comment

m3nu commented Jan 20, 2019

get_private_keys: do not try to read sockets #147

get_private_keys: do not try to read sockets #147

Conversation

sebcode commented Jan 20, 2019

ThomasWaldmann Jan 20, 2019

Choose a reason for hiding this comment

ThomasWaldmann left a comment

Choose a reason for hiding this comment

m3nu commented Jan 20, 2019