diff --git a/tests/configs/test2.cfg b/tests/configs/test2.cfg index 54ce2e44..5daf5858 100644 --- a/tests/configs/test2.cfg +++ b/tests/configs/test2.cfg @@ -42,7 +42,7 @@ bconfsrv = /dev/null # Please DO NOT touch the following line # @salted@ -[BASIC] +[BASIC:AUTH] priority = toto toto = pbkdf2:sha1:1000$HT0gMoYz$7540515e58f4ba54305664275a14ca5281c5d465 admin = pbkdf2:sha1:1000$Dgq3Nimi$5befb4cf4c3a7da2549679732908df5f0298b016 diff --git a/tests/configs/test4.cfg b/tests/configs/test4.cfg index 5d414eb4..d438c609 100644 --- a/tests/configs/test4.cfg +++ b/tests/configs/test4.cfg @@ -42,6 +42,6 @@ bconfsrv = /dev/null ## Please DO NOT touch the following line ## @salted@ -#[BASIC] +#[BASIC:AUTH] #priority = 100 #admin = pbkdf2:sha1:1000$CgUFdUCs$294cbaaba63ba59eb28e1a9a52263957478cd0e7 diff --git a/tests/configs/test6.cfg b/tests/configs/test6.cfg index b60015fa..f033a4ee 100644 --- a/tests/configs/test6.cfg +++ b/tests/configs/test6.cfg @@ -46,7 +46,7 @@ bconfsrv = this-file-should-not-exist # Please DO NOT touch the following line # @salted@ -[BASIC] +[BASIC:AUTH] admin = pbkdf2:sha1:1000$6pirc0vT$f9a6fb8b190d1c511aa9495dc18abb3dbd990d8f user1 = pbkdf2:sha1:1000$Qz7VdEqR$ecb2025e90516cb379c26d2e0a6b6e74cc6f8b9a diff --git a/tests/configs/test7-1.cfg b/tests/configs/test7-1.cfg index 9d065e37..587f9a9b 100644 --- a/tests/configs/test7-1.cfg +++ b/tests/configs/test7-1.cfg @@ -46,7 +46,7 @@ bconfsrv = this-file-should-not-exist # Please DO NOT touch the following line # @salted@ -[BASIC] +[BASIC:AUTH] admin = pbkdf2:sha1:1000$x0FYnJ8G$9a060c5939492f92a1889aa1a87a9647c3ec7a58 user1 = pbkdf2:sha1:1000$Iq2TSyBv$a6c22de68d387946195323f9130029085b9a3707 diff --git a/tests/configs/test7-2.cfg b/tests/configs/test7-2.cfg index dcd11c9e..2d9c3f36 100644 --- a/tests/configs/test7-2.cfg +++ b/tests/configs/test7-2.cfg @@ -46,7 +46,7 @@ bconfsrv = this-file-should-not-exist # Please DO NOT touch the following line # @salted@ -[BASIC] +[BASIC:AUTH] admin = pbkdf2:sha1:1000$NQcrMl1z$5687697aa1e2b4febe52741d50bd3265f3c7c99c user1 = pbkdf2:sha1:1000$vGGwkyTV$7fb645b398a160eb860add362b3e79ae00ab5c86 diff --git a/tests/configs/test7-3.cfg b/tests/configs/test7-3.cfg index cdd1a5c6..c30600ed 100644 --- a/tests/configs/test7-3.cfg +++ b/tests/configs/test7-3.cfg @@ -44,7 +44,7 @@ bconfcli = this-file-should-not-exist # burp server configuration file used for the setting page bconfsrv = this-file-should-not-exist -[BASIC] +[BASIC:AUTH] admin = admin user1 = password diff --git a/tests/configs/test7-4.cfg b/tests/configs/test7-4.cfg index d22d5e50..b335a31b 100644 --- a/tests/configs/test7-4.cfg +++ b/tests/configs/test7-4.cfg @@ -77,7 +77,7 @@ bconfcli = this-file-should-not-exist # burp server configuration file used for the setting page bconfsrv = this-file-should-not-exist -[BASIC] +[BASIC:AUTH] admin = pbkdf2:sha1:1000$07Q0FeKW$eab0bc54b0d2e779081fe85c91ea84a50203d0bf user1 = pbkdf2:sha1:1000$hWYnkYoh$ba7521104d262bb8cca3095c33ae1a3f19dbb3c7 diff --git a/tests/configs/test7-5.cfg b/tests/configs/test7-5.cfg index e1e99280..4df0d81b 100644 --- a/tests/configs/test7-5.cfg +++ b/tests/configs/test7-5.cfg @@ -77,7 +77,7 @@ bconfcli = this-file-should-not-exist # burp server configuration file used for the setting page bconfsrv = this-file-should-not-exist -[BASIC] +[BASIC:AUTH] admin = pbkdf2:sha1:1000$07Q0FeKW$eab0bc54b0d2e779081fe85c91ea84a50203d0bf user1 = pbkdf2:sha1:1000$hWYnkYoh$ba7521104d262bb8cca3095c33ae1a3f19dbb3c7 diff --git a/tests/configs/test8.cfg b/tests/configs/test8.cfg index ecb25a89..3492613c 100644 --- a/tests/configs/test8.cfg +++ b/tests/configs/test8.cfg @@ -77,7 +77,7 @@ bconfcli = this-file-should-not-exist # burp server configuration file used for the setting page bconfsrv = this-file-should-not-exist -[BASIC] +[BASIC:AUTH] admin = pbkdf2:sha1:1000$mv0bS5rd$f653a54f2edc321e8c320cf0b201ca36e3229349 user1 = pbkdf2:sha1:1000$hsljcrD3$10b8ea6bf0c9129ec56fbe94bdc8811fb2399c3f diff --git a/tests/configs/test_api_prefs.cfg b/tests/configs/test_api_prefs.cfg index c4d8971e..59ee5f7f 100644 --- a/tests/configs/test_api_prefs.cfg +++ b/tests/configs/test_api_prefs.cfg @@ -46,7 +46,7 @@ bconfsrv = /dev/null ## Please DO NOT touch the following line ## @salted@ -#[BASIC] +#[BASIC:AUTH] #priority = toto #toto = pbkdf2:sha1:1000$HT0gMoYz$7540515e58f4ba54305664275a14ca5281c5d465 #admin = pbkdf2:sha1:1000$Dgq3Nimi$5befb4cf4c3a7da2549679732908df5f0298b016 diff --git a/tests/legacy/test_burpui.py b/tests/legacy/test_burpui.py index a4f2827e..3f5b0e8a 100644 --- a/tests/legacy/test_burpui.py +++ b/tests/legacy/test_burpui.py @@ -366,13 +366,13 @@ class BurpuiACLTestCase(TestCase): rv = self.login('admin', 'admin') response = self.client.get(url_for('api.auth_users')) response2 = self.client.get(url_for('api.auth_backends')) - self.assertEqual(sorted(response.json, key=lambda k: k['name']), sorted([{'id': 'admin', 'name': 'admin', 'backend': 'BASIC'}, {'id': 'user1', 'name': 'user1', 'backend': 'BASIC'}], key=lambda k: k['name'])) - self.assertEqual(sorted(response2.json, key=lambda k: k['name']), sorted([{'add': True, 'del': True, 'name': 'BASIC', 'description': 'Uses the Burp-UI configuration file to load its rules.', 'priority': 100, 'type': 'authentication', 'mod': True}], key=lambda k: k['name'])) + self.assertEqual(sorted(response.json, key=lambda k: k['name']), sorted([{'id': 'admin', 'name': 'admin', 'backend': 'BASIC:AUTH'}, {'id': 'user1', 'name': 'user1', 'backend': 'BASIC:AUTH'}], key=lambda k: k['name'])) + self.assertEqual(sorted(response2.json, key=lambda k: k['name']), sorted([{'add': True, 'del': True, 'name': 'BASIC:AUTH', 'description': 'Uses the Burp-UI configuration file to load its rules.', 'priority': 100, 'type': 'authentication', 'mod': True}], key=lambda k: k['name'])) def test_change_password(self): with self.client: rv = self.login('user1', 'password') - response = self.client.post(url_for('api.auth_users', name='user1'), data={'backend': 'BASIC', 'old_password': 'plop', 'password': 'toto'}, headers={'X-Language': 'en'}) + response = self.client.post(url_for('api.auth_users', name='user1'), data={'backend': 'BASIC:AUTH', 'old_password': 'plop', 'password': 'toto'}, headers={'X-Language': 'en'}) self.assert_status(response, 200) def test_config_render_ko(self):