File size: 6,418 Bytes
8247f19 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 | diff --git a/README.md b/README.md
index 8d357d64..a4294793 100644
--- a/README.md
+++ b/README.md
@@ -115,6 +115,7 @@ Professional support for Rdiffweb is available by contacting [IKUS Soft](https:/
* Sent email notification to user when a new SSH Key get added - credit to [Nehal Pillai](https://www.linkedin.com/in/nehal-pillai-02a854172)
* Ratelimit "Resend code to my email" in Two-Factor Authentication view - credit to [Nehal Pillai](https://www.linkedin.com/in/nehal-pillai-02a854172)
* Username are not case-insensitive - credits to [raiders0786](https://www.linkedin.com/in/chirag-agrawal-770488144/)
+* Make sure that all ssh keys are unique, regardless of the user - credit to [Nehal Pillai](https://www.linkedin.com/in/nehal-pillai-02a854172)
Breaking changes:
diff --git a/rdiffweb/core/model/__init__.py b/rdiffweb/core/model/__init__.py
index df13f84c..1c7e3636 100644
--- a/rdiffweb/core/model/__init__.py
+++ b/rdiffweb/core/model/__init__.py
@@ -19,12 +19,12 @@ import logging
import sys
import cherrypy
-from sqlalchemy import event
+from sqlalchemy import event, func
from sqlalchemy.exc import IntegrityError
from ._repo import RepoObject # noqa
from ._session import DbSession, SessionObject # noqa
-from ._sshkey import SshKey # noqa
+from ._sshkey import SshKey, sshkey_fingerprint_index # noqa
from ._token import Token # noqa
from ._user import DuplicateSSHKeyError, UserObject, user_username_index # noqa
@@ -137,3 +137,22 @@ def db_after_create(target, connection, **kw):
logger.error(msg)
print(msg, file=sys.stderr)
raise SystemExit(12)
+
+ # Fix SSH Key uniqueness - since 2.5.4
+ if not _index_exists(connection, 'sshkey_fingerprint_index'):
+ duplicate_sshkeys = (
+ SshKey.query.with_entities(SshKey.fingerprint)
+ .group_by(SshKey.fingerprint)
+ .having(func.count(SshKey.fingerprint) > 1)
+ ).all()
+ try:
+ sshkey_fingerprint_index.create()
+ except IntegrityError:
+ msg = (
+ 'Failure to upgrade your database to make SSH Keys unique. '
+ 'You must downgrade and deleted duplicate SSH Keys. '
+ '%s' % '\n'.join([str(k) for k in duplicate_sshkeys]),
+ )
+ logger.error(msg)
+ print(msg, file=sys.stderr)
+ raise SystemExit(12)
diff --git a/rdiffweb/core/model/_sshkey.py b/rdiffweb/core/model/_sshkey.py
index 38421943..48b671b8 100644
--- a/rdiffweb/core/model/_sshkey.py
+++ b/rdiffweb/core/model/_sshkey.py
@@ -16,7 +16,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import cherrypy
-from sqlalchemy import Column, Integer, Text
+from sqlalchemy import Column, Index, Integer, Text
Base = cherrypy.tools.db.get_base()
@@ -27,3 +27,7 @@ class SshKey(Base):
fingerprint = Column('Fingerprint', Text)
key = Column('Key', Text, unique=True, primary_key=True)
userid = Column('UserID', Integer, nullable=False)
+
+
+# Make finger print unique
+sshkey_fingerprint_index = Index('sshkey_fingerprint_index', SshKey.fingerprint, unique=True)
diff --git a/rdiffweb/core/model/_user.py b/rdiffweb/core/model/_user.py
index 9b06363c..a448aac3 100644
--- a/rdiffweb/core/model/_user.py
+++ b/rdiffweb/core/model/_user.py
@@ -159,7 +159,7 @@ class UserObject(Base):
assert key
key = authorizedkeys.check_publickey(key)
- # Remove option, replace comments.
+ # Remove option & Remove comment for SQL storage
key = authorizedkeys.AuthorizedKey(
options=None, keytype=key.keytype, key=key.key, comment=comment or key.comment
)
@@ -176,7 +176,8 @@ class UserObject(Base):
# Also look in database.
logger.info("add key [%s] to [%s] database", key, self.username)
try:
- SshKey(userid=self.userid, fingerprint=key.fingerprint, key=key.getvalue()).add().flush()
+ sshkey = SshKey(userid=self.userid, fingerprint=key.fingerprint, key=key.getvalue())
+ sshkey.add().flush()
except IntegrityError:
raise DuplicateSSHKeyError(
_("Duplicate key. This key already exists or is associated to another user.")
diff --git a/rdiffweb/core/model/tests/test_user.py b/rdiffweb/core/model/tests/test_user.py
index 569ac52a..401d5de3 100644
--- a/rdiffweb/core/model/tests/test_user.py
+++ b/rdiffweb/core/model/tests/test_user.py
@@ -325,15 +325,47 @@ class UserObjectTest(rdiffweb.test.WebCase):
def test_add_authorizedkey_duplicate(self):
# Read the pub key
key = self._read_ssh_key()
- # Add the key to the user
+ # Given a user with a SSH Key
userobj = UserObject.get_user(self.USERNAME)
userobj.add_authorizedkey(key)
userobj.commit()
- # Add the same key
+
+ # When adding the same identical key.
+ # Then an error is raised
with self.assertRaises(DuplicateSSHKeyError):
userobj.add_authorizedkey(key)
userobj.commit()
+ def test_add_authorizedkey_duplicate_new_comment(self):
+ # Read the pub key
+ key = self._read_ssh_key()
+ # Given a user with a SSH Key
+ userobj = UserObject.get_user(self.USERNAME)
+ userobj.add_authorizedkey(key)
+ userobj.commit()
+
+ # When adding the same key with a different comment
+ # Then an error is raised
+ with self.assertRaises(DuplicateSSHKeyError):
+ userobj.add_authorizedkey(key, comment="new comment")
+ userobj.commit()
+
+ def test_add_authorizedkey_duplicate_new_user(self):
+ # Read the pub key
+ key = self._read_ssh_key()
+ # Given a user with a SSH Key
+ userobj = UserObject.get_user(self.USERNAME)
+ userobj.add_authorizedkey(key)
+ userobj.commit()
+
+ # When adding the same key to a different user
+ # Then an error is raised
+ newuser = UserObject.add_user("newuser")
+ newuser.commit()
+ with self.assertRaises(DuplicateSSHKeyError):
+ newuser.add_authorizedkey(key, comment="new comment")
+ newuser.commit()
+
def test_add_authorizedkey_with_file(self):
"""
Add an ssh key for a user with an authorizedkey file.
|