Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-08 02:34:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix library restriction not fully case-insensitive

Browse Source
This commit is contained in:
Kovid Goyal 2017-05-13 18:05:55 +05:30
parent fd9b16ece2
commit 12c8f8f29c
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/srv/tests/auth.py
View File

@ -147,7 +147,7 @@ class TestAuth(BaseTest):
self.assertRaises(HTTPForbidden, get_library, 'xxx') self.assertRaises(HTTPForbidden, get_library, 'xxx')
um.add_user('a', 'a') um.add_user('a', 'a')
self.assertEqual(library_info('a')[0], {'l%d'%i:'l%d'%i for i in range(1, 4)}) self.assertEqual(library_info('a')[0], {'l%d'%i:'l%d'%i for i in range(1, 4)})
um.update_user_restrictions('a', {'blocked_library_names': ['l2']}) um.update_user_restrictions('a', {'blocked_library_names': ['L2']})
self.assertEqual(library_info('a')[0], {'l%d'%i:'l%d'%i for i in range(1, 4) if i != 2}) self.assertEqual(library_info('a')[0], {'l%d'%i:'l%d'%i for i in range(1, 4) if i != 2})
um.update_user_restrictions('a', {'allowed_library_names': ['l3']}) um.update_user_restrictions('a', {'allowed_library_names': ['l3']})
self.assertEqual(library_info('a')[0], {'l%d'%i:'l%d'%i for i in range(1, 4) if i == 3}) self.assertEqual(library_info('a')[0], {'l%d'%i:'l%d'%i for i in range(1, 4) if i == 3})

4
src/calibre/srv/users.py
View File

@ -28,8 +28,8 @@ def parse_restriction(raw):
r = load_json(raw) r = load_json(raw)
if not isinstance(r, dict): if not isinstance(r, dict):
r = {} r = {}
r['allowed_library_names'] = frozenset(r.get('allowed_library_names', ())) r['allowed_library_names'] = frozenset(map(lambda x: x.lower(), r.get('allowed_library_names', ())))
r['blocked_library_names'] = frozenset(r.get('blocked_library_names', ())) r['blocked_library_names'] = frozenset(map(lambda x: x.lower(), r.get('blocked_library_names', ())))
return r return r