Skip to content

Fix sudo cmd && cmd. make gkey strip whitespace and accept lowercase. implement toggle password visibility #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
onlykey merged 4 commits into from
Sep 8, 2020
Merged

Fix sudo cmd && cmd. make gkey strip whitespace and accept lowercase. implement toggle password visibility #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0044748
sudo cmd && cmd --> sudo cmd && sudo cmd
ejhuff Aug 29, 2020
1069ccc
sudo cmd && cmd --> sudo bash -c 'cmd && cmd'
ejhuff Aug 29, 2020
26c230e
make gkey strip whitespace and accept lowercase
ejhuff Aug 29, 2020
f484e41
Implement control-t to toggle password visibility
ejhuff Sep 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ $ sudo apt install python3-pip python3-tk libusb-1.0-0-dev libudev-dev
$ pip3 install onlykey
$ wget https://raw.githubusercontent.com/trustcrypto/trustcrypto.github.io/master/49-onlykey.rules
$ sudo cp 49-onlykey.rules /etc/udev/rules.d/
$ sudo udevadm control --reload-rules && udevadm trigger
$ sudo bash -c 'udevadm control --reload-rules && udevadm trigger'
```

### Debian Install with dependencies
Expand All @@ -47,7 +47,7 @@ $ sudo apt install python3-pip python3-tk libusb-1.0-0-dev libudev-dev
$ pip3 install onlykey
$ wget https://raw.githubusercontent.com/trustcrypto/trustcrypto.github.io/master/49-onlykey.rules
$ sudo cp 49-onlykey.rules /etc/udev/rules.d/
$ sudo udevadm control --reload-rules && udevadm trigger
$ sudo bash -c 'udevadm control --reload-rules && udevadm trigger'
```

### RedHat Install with dependencies
Expand All @@ -58,7 +58,7 @@ $ yum install python3-pip python3-devel python3-tk libusb-devel libudev-devel \
$ pip3 install onlykey
$ wget https://raw.githubusercontent.com/trustcrypto/trustcrypto.github.io/master/49-onlykey.rules
$ sudo cp 49-onlykey.rules /etc/udev/rules.d/
$ sudo udevadm control --reload-rules && udevadm trigger
$ sudo bash -c 'udevadm control --reload-rules && udevadm trigger'
```

### Fedora Install with dependencies
Expand All @@ -68,7 +68,7 @@ $ dnf install python3-pip python3-devel python3-tkinter libusb-devel libudev-dev
$ pip3 install onlykey
$ wget https://raw.githubusercontent.com/trustcrypto/trustcrypto.github.io/master/49-onlykey.rules
$ sudo cp 49-onlykey.rules /etc/udev/rules.d/
$ sudo udevadm control --reload-rules && udevadm trigger
$ sudo bash -c 'udevadm control --reload-rules && udevadm trigger'
```

### OpenSUSE Install with dependencies
Expand All @@ -77,7 +77,7 @@ $ zypper install python3-pip python3-devel python3-tk libusb-1_0-devel libudev-d
$ pip3 install onlykey
$ wget https://raw.githubusercontent.com/trustcrypto/trustcrypto.github.io/master/49-onlykey.rules
$ sudo cp 49-onlykey.rules /etc/udev/rules.d/
$ sudo udevadm control --reload-rules && udevadm trigger
$ sudo bash -c 'udevadm control --reload-rules && udevadm trigger'
```

### Arch Linux Install with dependencies
Expand All @@ -86,7 +86,7 @@ $ sudo pacman -Sy git python3-setuptools python3 libusb python3-pip
$ pip3 install onlykey
$ wget https://raw.githubusercontent.com/trustcrypto/trustcrypto.github.io/master/49-onlykey.rules
$ sudo cp 49-onlykey.rules /etc/udev/rules.d/
$ sudo udevadm control --reload-rules && udevadm trigger
$ sudo bash -c 'udevadm control --reload-rules && udevadm trigger'
```

### FreeBSD Install with dependencies
Expand Down
16 changes: 10 additions & 6 deletions onlykey/cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,23 +27,27 @@ def cli():

logging.basicConfig(level=logging.DEBUG)

# ContrlT handling
# Control-T handling
hidden = [True] # Nonlocal
key_bindings = KeyBindings()

@key_bindings.add('c-t')
def _(event):
' When ControlT has been pressed, toggle visibility. '
' When Control-T has been pressed, toggle visibility. '
hidden[0] = not hidden[0]

def prompt_pass():
print('Type Control-T to toggle password visible.')
password = prompt('Password/Key: ', is_password=True)
password = prompt('Password/Key: ',
is_password=Condition(lambda: hidden[0]),
key_bindings=key_bindings)
return password

def prompt_key():
print('Type Control-T to toggle key visible.')
key = prompt('Key: ', is_password=True)
key = prompt('Key: ',
is_password=Condition(lambda: hidden[0]),
key_bindings=key_bindings)
return key

def prompt_pin():
Expand Down Expand Up @@ -185,7 +189,7 @@ def prompt_pin():
only_key.setslot(slot_id, MessageField.TFATYPE, sys.argv[4])
elif sys.argv[3] == 'gkey':
totpkey = prompt_key()
totpkey = base64.b32decode(totpkey)
totpkey = base64.b32decode("".join(totpkey.split()).upper())
totpkey = binascii.hexlify(totpkey)
# pad with zeros for even digits
totpkey = totpkey.zfill(len(totpkey) + len(totpkey) % 2)
Expand Down Expand Up @@ -419,7 +423,7 @@ def mprompt():
only_key.setslot(slot_id, MessageField.TFATYPE, data[3])
elif data[2] == 'gkey':
totpkey = prompt_key()
totpkey = base64.b32decode(totpkey)
totpkey = base64.b32decode("".join(totpkey.split()).upper())
totpkey = binascii.hexlify(totpkey)
# pad with zeros for even digits
totpkey = totpkey.zfill(len(totpkey) + len(totpkey) % 2)
Expand Down