Commit Graph

3498 Commits

Author SHA1 Message Date
Haoxi Tan
9a59297daf add comment 2020-01-17 14:29:41 +10:00
Haoxi Tan
cbe5381997 fixing test 2020-01-17 13:05:43 +10:00
Haoxi Tan
27514b93d3 fixing test 2020-01-17 12:55:37 +10:00
Haoxi Tan
39c07feeb2 fixing test 2020-01-17 12:30:17 +10:00
Haoxi Tan
3507ffe652 fixing test 2020-01-17 12:14:02 +10:00
Haoxi Tan
43e2e5bec0 increasing test delay for hook victim 2020-01-17 12:02:30 +10:00
Haoxi Tan
62186583a6 fixing #1851 2020-01-17 11:41:07 +10:00
bcoles
ac2627383d Merge pull request #1853 from bcoles/assethandler
Add error handling and minor code cleanup
2020-01-16 23:37:42 +11:00
Haoxi Tan
811d20eea0 Merge branch 'master' of https://github.com/beefproject/beef 2020-01-16 13:03:04 +10:00
jcrew99
cbd42c198a Merge pull request #1857 from beefproject/fix-1852
fixing issue #1852
Passes fine
2020-01-16 12:07:39 +10:00
Haoxi Tan
282575f9a6 killing things properly in tests involving beef http server 2020-01-16 11:52:04 +10:00
Haoxi Tan
cecbabe42a added test for fixing #1852 2020-01-16 11:29:59 +10:00
Haoxi Tan
7d9a235bbf Revert "fixing issue #1852"
This reverts commit 375c0d9b8b.
2020-01-16 11:24:11 +10:00
Haoxi Tan
375c0d9b8b fixing issue #1852 2020-01-16 11:18:09 +10:00
Haoxi Tan
4ac293a2e5 updated browser details test 2020-01-16 11:17:15 +10:00
Haoxi Tan
00eaa6a661 fixing tests 2020-01-15 14:51:04 +10:00
Haoxi Tan
fc1b0c6da4 commented out simplecov 2020-01-15 14:45:29 +10:00
Haoxi Tan
d417645b28 fixed ARE engine issue #1855 2020-01-15 14:30:31 +10:00
Haoxi Tan
3f314fc055 fixing test 2020-01-15 13:58:53 +10:00
Haoxi Tan
d2f3c7fbe2 added tests for browser details handler 2020-01-15 13:47:46 +10:00
Grant Burgess
a46a2fe2c1 Merge branch 'master' of github.com:beefproject/beef 2020-01-15 12:56:25 +10:00
Grant Burgess
d76294735c Fixed issue where pull request #1846 changes were
not merged to master.
2020-01-15 12:55:17 +10:00
Brendan Coles
976eb5ec1c Add error handling and minor code cleanup 2020-01-14 07:06:55 +00:00
Haoxi Tan
3770b43534 updated PR template 2020-01-14 15:13:53 +10:00
Haoxi Tan
ee1739b200 updated PR template 2020-01-14 15:12:56 +10:00
Haoxi Tan
c01c07ad81 updated PR template 2020-01-14 15:02:44 +10:00
Haoxi Tan
256377a8db updated PR template 2020-01-14 15:01:34 +10:00
Haoxi Tan
17b0949f02 added pull request template 2020-01-14 14:57:58 +10:00
Haoxi Tan
ce72aa8fc0 added CONTRIBUTING and SECURITY md files in .github 2020-01-14 14:40:56 +10:00
Grant Burgess
bac84f4f26 Merge pull request #1849 from beefproject/fix_tests_to_run_in_random_order
Set the credentials before test runs
2020-01-14 10:40:59 +10:00
Grant Burgess
4d7810e730 Set the credentials before test runs 2020-01-14 10:31:30 +10:00
Grant Burgess
9945fcd3eb Merge pull request #1848 from beefproject/fix_broken_admin_ui_access
Fixed test to run in random order
2020-01-14 10:29:39 +10:00
Grant Burgess
ce4f480957 Fixed test to run in random order 2020-01-14 10:00:03 +10:00
jcrew99
079f3dae56 Merge pull request #1847 from beefproject/reset_head
Reset head
2020-01-13 14:37:24 +10:00
jcrew99
7e4f636869 Merge pull request #1846 from beefproject/fix_tests_to_run_in_random_order
Fix tests to run in random order
2020-01-13 13:10:44 +10:00
jcrew99
5de127a0e2 Merge pull request #1845 from beefproject/fix_broken_admin_ui_access
Fix broken admin ui access
2020-01-13 13:08:24 +10:00
Grant Burgess
d26a0fda33 Re-enabled the test as it now passes 2020-01-13 12:54:13 +10:00
Grant Burgess
a113d896e7 Cleared arguements before tests run 2020-01-13 12:53:29 +10:00
Grant Burgess
d0dced8848 Added catch to disable logging during test 2020-01-13 12:53:00 +10:00
Grant Burgess
28b5eef779 Tests to cover Admin UI access 2020-01-10 14:45:14 +10:00
Grant Burgess
a2de71c151 Added router/error_responses 2020-01-10 14:44:51 +10:00
Grant Burgess
1c4ef22947 Changed references to constants to modify easily 2020-01-10 14:43:51 +10:00
Grant Burgess
efad3c3d23 Made 404 error responses constants to use with UI 2020-01-10 14:42:35 +10:00
Grant Burgess
35876694b0 Determines the correct IP if reverse proxy enabled 2020-01-10 14:40:29 +10:00
Grant Burgess
9065fc9514 Check request IP before resolving the Admin UI 2020-01-10 14:38:06 +10:00
Grant Burgess
998c3fd8b2 Added config option that Closes #1354 2020-01-10 14:36:37 +10:00
Haoxi Tan
f5de5eb7c0 updated dns extension to use async-dns instead of old rubydns 2020-01-10 09:43:45 +10:00
Haoxi Tan
39ef3fe4f6 changed module description for iframe key logger 2020-01-10 08:23:55 +10:00
Haoxi Tan
1ff2272566 updated working browsers 2020-01-09 10:57:10 +10:00
Haoxi Tan
5db7f16eef added simplecov output 2020-01-09 08:40:18 +10:00