Skip to content

Reject desktop clients older than 2.0.27 #64

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Reject desktop clients older than 2.0.27 #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c1edbb4
Fix client version checks
tsdko Jan 21, 2017
990d13e
Reject desktop clients older than 2.0.27
tsdko Mar 4, 2017
3cdf0ad
Remove irrelevant test
tsdko Mar 5, 2017
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
44 changes: 19 additions & 25 deletions AnkiServer/apps/sync_app.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,35 +57,20 @@ def __init__(self, col):
# So that 'server' (the 3rd argument) can't get set
Syncer.__init__(self, col)

def meta(self, cv=None):
def meta(self):
# Make sure the media database is open!
if self.col.media.db is None:
self.col.media.connect()

if cv is not None:
client, version, platform = cv.split(',')
else:
client = 'ankidesktop'
version = '2.0.12'
platform = 'unknown'

version_int = [ int(str(x).translate(None, string.ascii_letters))
for x in version.split('.') ]

# Some insanity added in Anki 2.0.13
if (client == 'ankidroid' and version_int[0] >=2 and version_int[1] >= 3) \
or (client == 'ankidesktop' and version_int[0] >= 2 and version_int[1] >= 0 and version_int[2] >= 13):
return {
'scm': self.col.scm,
'ts': intTime(),
'mod': self.col.mod,
'usn': self.col._usn,
'musn': self.col.media.lastUsn(),
'msg': '',
'cont': True,
}
else:
return (self.col.mod, self.col.scm, self.col._usn, intTime(), self.col.media.lastUsn())
return {
'scm': self.col.scm,
'ts': intTime(),
'mod': self.col.mod,
'usn': self.col._usn,
'musn': self.col.media.lastUsn(),
'msg': '',
'cont': True,
}

class SyncMediaHandler(MediaSyncer):
operations = ['begin', 'mediaChanges', 'mediaSanity', 'mediaList', 'uploadChanges', 'downloadFiles']
Expand Down Expand Up @@ -569,6 +554,15 @@ def __call__(self, req):
del data['v']
if data.has_key('cv'):
session.client_version = data['cv']
client, version, platform = data['cv'].split(',')
del data['cv']

version_int = [ int(str(x).translate(None, string.ascii_letters))
for x in version.split('.') ]

if (client == 'ankidroid' and version_int < [2, 3, 0]) \
or (client == 'ankidesktop' and version_int < [2, 0, 27]):
return Response(status="501") # client needs upgrade
self.session_manager.save(hkey, session)
session = self.session_manager.load(hkey, self.create_session)

Expand Down
28 changes: 0 additions & 28 deletions tests/test_sync_app.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,34 +28,6 @@ def tearDown(self):
CollectionTestBase.tearDown(self)
self.syncCollectionHandler = None

def test_meta(self):
version_info = (None,
','.join(('ankidesktop', '2.0.12', 'lin::')),
','.join(('ankidesktop', '2.0.32', 'lin::')))

meta = self.syncCollectionHandler.meta(version_info[0])
self.assertEqual(meta[0], self.collection.mod)
self.assertEqual(meta[1], self.collection.scm)
self.assertEqual(meta[2], self.collection._usn)
self.assertTrue((type(meta[3]) == int) and meta[3] > 0)
self.assertEqual(meta[4], self.collection.media.lastUsn())

meta = self.syncCollectionHandler.meta(version_info[1])
self.assertEqual(meta[0], self.collection.mod)
self.assertEqual(meta[1], self.collection.scm)
self.assertEqual(meta[2], self.collection._usn)
self.assertTrue((type(meta[3]) == int) and meta[3] > 0)
self.assertEqual(meta[4], self.collection.media.lastUsn())

meta = self.syncCollectionHandler.meta(version_info[2])
self.assertEqual(meta['scm'], self.collection.scm)
self.assertTrue((type(meta['ts']) == int) and meta['ts'] > 0)
self.assertEqual(meta['mod'], self.collection.mod)
self.assertEqual(meta['usn'], self.collection._usn)
self.assertEqual(meta['musn'], self.collection.media.lastUsn())
self.assertEqual(meta['msg'], '')
self.assertEqual(meta['cont'], True)


class SimpleUserManagerTest(unittest.TestCase):
_good_test_un = 'username'
Expand Down