hiro/rmview
1
0
Fork 0
mirror of https://github.com/vale981/rmview synced 2025-03-05 09:11:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adding meaningful feedback when host keys don't match / aren't found

Browse source
This commit is contained in:
Emanuele 2020-12-21 00:59:20 +01:00
parent 0fa4234fdc
commit 4ebdf585ef
2 changed files with 36 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -90,7 +90,7 @@ Connection parameters are provided as a dictionary with the following keys (all
An update to the reMarkable tablet would change its "fingerprint" i.e. the identifier that signals we are connecting to the expected device (and not somebody impersonating it).
When this happens you may get an error message upon connection.
There are two main ways to fix this:
1. Change your `.known_hosts` file to match the new fingerprint (you can get instructions by connecting manually via ssh).
1. Change your `~/.ssh/known_hosts` file to match the new fingerprint (you can get instructions by connecting manually via ssh).
2. Set the `insecure_auto_add_host` setting to `true`, which will make rmview ignore the check.
This is not recommended unless you are in a trusted network.

36
src/rmview/rmview.py
View file

@ -7,6 +7,8 @@ from .workers import FrameBufferWorker, PointerWorker
from .connection import rMConnect
from .viewer import QtImageViewer
from paramiko import BadHostKeyException, SSHException
from .rmparams import *
import sys
@ -335,7 +337,39 @@ class rMViewApp(QApplication):
icon = QPixmap(":/assets/dead.svg")
icon.setDevicePixelRatio(self.devicePixelRatio())
mbox.setIconPixmap(icon)
mbox.setInformativeText("I could not connect to the reMarkable at %s:\n%s." % (self.config.get('ssh').get('address'), e))
if isinstance(e, BadHostKeyException):
mbox.setDetailedText(str(e))
mbox.setInformativeText(
"<big>The host at %s has the wrong key.<br>"
"This usually happens just after a software update on the tablet.</big><br><br>"
"You have three options to fix this problem:"
"<ol><li>"
"Change your <code>~/.ssh/known_hosts</code> file to match the new fingerprint.<br>"
"The easiest way to do this is connecting manually via ssh and follow the instructions."
"<br></li><li>"
"Set <code>\"insecure_auto_add_host\": true</code> to rmView\'s settings.<br>"
"This is not recommended unless you are in a trusted network."
"<br></li><li>"
"Connect using username/password."
"<br></li><ol>" % (self.config.get('ssh').get('address'))
)
elif isinstance(e, SSHException) and str(e).endswith('known_hosts'):
mbox.setInformativeText(
"<big>The host at %s is unknown.<br>"
"This usually happens if this is the first time you use ssh with your tablet.</big><br><br>"
"You have three options to fix this problem:"
"<ol><li>"
"Change your <code>~/.ssh/known_hosts</code> file to match the new fingerprint.<br>"
"The easiest way to do this is connecting manually via ssh and follow the instructions."
"<br></li><li>"
"Set <code>\"insecure_auto_add_host\": true</code> to rmView\'s settings.<br>"
"This is not recommended unless you are in a trusted network."
"<br></li><li>"
"Connect using username/password."
"<br></li><ol>" % (self.config.get('ssh').get('address'))
)
else:
mbox.setInformativeText("I could not connect to the reMarkable at %s:\n%s." % (self.config.get('ssh').get('address'), e))
mbox.addButton(QMessageBox.Cancel)
if self.config_file:
mbox.addButton("Settings...", QMessageBox.ResetRole)