Commit Graph

4222 Commits

Author SHA1 Message Date
Bucky Wilson
c09e6405e2 Make Webkit fingerprinting more explicit.
Copied common code from /isS\d\>/ functions into isWebKitBased

    modified:   core/main/client/browser.js
2018-01-09 09:16:30 +10:00
Bucky Wilson
f92aed46c2 Restore webkit checking. Additional comments.
Added `isWebKitBased` function.
Due to who knows what version is being used -- this primarily checks for Safari.
Eliminating code duplication and bugs.

Corrected getBrowserVersion comment.

    modified:   core/main/client/browser.js
2018-01-08 09:44:59 +10:00
Bucky Wilson
3d41fe1045 Commit review updates: added test to integration, removed debug
Added test TC_1333 to integration suite. adjusted requirements.

Removed debug requirement from main file.

    modified:   beef
    modified:   test/api/1333_auth_rate.rb
    modified:   test/integration/ts_integration.rb
2018-01-07 16:52:59 +10:00
Bucky Wilson
a2c097a47f Code review updates, speeling, and removed reliance on isS
modified:   core/main/client/browser.js
2018-01-07 15:22:21 +10:00
Bucky Wilson
190b425a30 Update epiphany browser icon, and let it be seen
New epiphany icon from : https://wiki.gnome.org/Apps/Web
Resized to 10% for space.

Added discovery details, to constants and models.

    modified:   core/main/models/browserdetails.rb
    modified:   extensions/admin_ui/constants/agents.rb
    modified:   extensions/admin_ui/media/images/icons/epiphany.png
2018-01-06 13:12:46 +10:00
Bucky Wilson
628ddb8dc2 Epiphany version returned.
Basing the Epiphany version of UserAgant name - for want of a better
way of determining this at this stage.

    modified:   core/main/client/browser.js
2018-01-06 12:37:52 +10:00
Bucky Wilson
86c3212e2e Whitespace changes - indentation consistency
Clearing the noise from the commit diff -
editor imposed whitespace style changes.

    modified:   core/main/client/browser.js
2018-01-06 12:36:03 +10:00
Bucky Wilson
4595f0d2ed Minor corrections to comments and return value for browser type
Make the hooked browser name and browser types consistent.

    modified:   core/main/client/browser.js
2018-01-06 12:31:54 +10:00
Bucky Wilson
5a35b1cde2 Recognising Epiphany as an indendant browser
Added 'EP' as a browser name, to be recognised on response.
2018-01-06 10:22:03 +10:00
Bucky Wilson
bc709db733 Breif checking for Epiphany browser
Only recognises the browser -- not yet looking for a version.
2018-01-04 19:00:07 +10:00
Bucky Wilson
83d274719d Merge branch '1333_rating_limit' into 1333_rate_merged 2018-01-04 15:42:55 +10:00
Wade Alcorn
fca5279f17 Updated Copyright dates 2018-01-04 09:12:47 +10:00
Bucky Wilson
f98dfd4515 Moving pry and pry-byebug into tests group. 2017-12-13 17:14:58 +10:00
Bucky Wilson
dbb1b7daf4 Renamed tmp config file - corrected tear down
FIXED Too many rake name to tear things down correctly.

	modified:   Rakefile
2017-12-12 14:54:17 +10:00
Bucky Wilson
f52b13a6ee Added assertions for testing, corrected beef tear-down
Turned the exercise script into a limited test.
Added is password function to rest client
Corrected incorrect tear down in the Rakefile

	modified:   Rakefile
	modified:   test/api/1333_auth_rate.rb
	modified:   test/api/lib/beef_rest_client.rb
2017-12-12 14:35:22 +10:00
Bucky Wilson
5559e34baa Pre-creation of actual test
1333_auth_rate - multiple cyles of api auth requests at different
speeds.
Fast auth attempts should block
Solwer attempts, when valid should succeed

	modified:   Rakefile
	renamed:    test/api/beef_rest.rb -> test/api/1333_auth_rate.rb
2017-12-12 12:23:31 +10:00
Bucky Wilson
3b470439fa Added auth access time checking
Time set on failure,
Next request fails if inside configured time: beef.restrictions.api_attempt_delay

	modified:   core/main/rest/handlers/admin.rb
2017-12-11 17:48:40 +10:00
Bucky Wilson
f42346fc1a /update timeout? definition.
Only one exit from function.

	modified:   core/main/rest/api.rb
2017-12-11 17:38:45 +10:00
Bucky Wilson
a38c0adaf7 Merge branch '1333_rating_limit' of github.com-wanton1950:wanton1950/beef into 1333_rating_limit 2017-12-11 12:11:08 +10:00
Bucky Wilson
8dcac3d50e Test,/exercise script to evaluate rate limiting
Debug details in the script
2017-12-11 12:01:29 +10:00
Bucky Wilson
cc3bfc071e Added speed checking of api auth calls.
Added beef_rest_client based on the beef rest api found in tools/lib
Added mass auth attempts

Adjusted test_constants to use environment variables -- to use with
rake.

Eventually should be a test
2017-12-11 12:01:29 +10:00
Bucky Wilson
8d226378b7 Added rest_test entry to the rake file. Updated beef start/stop
Using 'custom' config rake starting.
2017-12-11 12:00:42 +10:00
Bucky Wilson
580303a150 Undo 'fix' rate limiting the routing.
As per comments - <parphrased> rate limiting at this point, rate limites
everything, and can raise suspiscions.
2017-12-11 12:00:42 +10:00
Bucky Wilson
e26ebea0f3 Debugging tools added: pry-byebug 2017-12-11 12:00:42 +10:00
Bucky Wilson
73bbda7336 gem lock file updates -- not sure this should be committed 2017-12-11 12:00:42 +10:00
Bucky Wilson
01dd3eb714 FIXED #1333 Rate limit calls.
Clean-up duplicate functionality.
EOL whitespace removed

Changes to be committed:
	modified:   extensions/admin_ui/controllers/authentication/authentication.rb
2017-12-11 11:50:18 +10:00
Bucky Wilson
a538a9ebd5 1333: Rate Limit API - 1 in user defined value
Allow api connection every api_attempt_delay milliseconds.
Currently 50 mSec

Uses the same process as ui/admin rate limiting.

Changes to be committed:
	modified:   config.yaml
	modified:   core/main/rest/api.rb
	modified:   core/main/router/router.rb
2017-12-11 11:50:18 +10:00
Bucky Wilson
2da975aee0 Gemfile - whitespace, added dev group: pry 2017-12-11 11:50:18 +10:00
Bucky Wilson
5a80f4a3a5 And then removing these lines - still no error
Error maynot be solved by the introduction of db_pool/db_timeout
Restarting - may resolve issues.
2017-12-11 11:46:02 +10:00
Bucky Wilson
717c5f52eb Fixed: 'DataObjects::ConnectionError - database is locked:' error
Getting error using sqlite database.
Added: db_pool, and db_timeout to correct.
2017-12-11 11:46:02 +10:00
Brendan Coles
24298b4d9e Clean beef executable 2017-12-09 06:24:00 +00:00
Brendan Coles
a8763b48c5 Downgrade selenium-webdriver gem to '~> 2.53.4' for tests 2017-12-09 00:04:52 +00:00
Brendan Coles
3ec6241c46 Fix login tests 2017-12-09 00:02:36 +00:00
Brendan Coles
825b433084 BeEF require Ruby 2.2 or newer 2017-12-08 23:05:43 +00:00
Brendan Coles
903d364450 Remove experimental extensions from config.yaml 2017-12-08 18:14:32 +00:00
Brendan Coles
946f593b5e Fix $LOAD_PATH 2017-12-08 07:03:27 +00:00
Brendan Coles
447f995d10 Merge pull request #1476 from stevetauber/master
Fixing syntax error in identify_lan_subnets
2017-12-06 07:25:09 +11:00
Steve Tauber
2cc843f640 Fixing syntax error in identify_lan_subnets 2017-12-03 20:39:44 +01:00
Bucky Wilson
dab2b26102 Merge branch '1333_rating_limit' of github.com-wanton1950:wanton1950/beef into 1333_rating_limit 2017-11-28 10:29:01 +10:00
Bucky Wilson
a94c6f36df FIXED #1333 Rate limit calls.
Clean-up duplicate functionality.
EOL whitespace removed

Changes to be committed:
	modified:   extensions/admin_ui/controllers/authentication/authentication.rb
2017-11-28 10:19:44 +10:00
Bucky Wilson
0eb6010898 1333: Rate Limit API - 1 in user defined value
Allow api connection every api_attempt_delay milliseconds.
Currently 50 mSec

Uses the same process as ui/admin rate limiting.

Changes to be committed:
	modified:   config.yaml
	modified:   core/main/rest/api.rb
	modified:   core/main/router/router.rb
2017-11-28 10:19:44 +10:00
Bucky Wilson
e86e05d20f Gemfile - whitespace, added dev group: pry 2017-11-28 10:19:44 +10:00
Bucky Wilson
17eb6cbd9c And then removing these lines - still no error
Error maynot be solved by the introduction of db_pool/db_timeout
Restarting - may resolve issues.
2017-11-28 10:19:44 +10:00
Bucky Wilson
557a17d2e3 Fixed: 'DataObjects::ConnectionError - database is locked:' error
Getting error using sqlite database.
Added: db_pool, and db_timeout to correct.
2017-11-28 10:19:44 +10:00
Brendan Coles
fc480cd117 Add check for web sockets and web workers 2017-11-26 10:25:18 +00:00
Bucky Wilson
183efca59d Merge branch '1333_rating_limit' of github.com-wanton1950:wanton1950/beef into 1333_rating_limit 2017-11-24 17:59:38 +10:00
Bucky Wilson
f92446abd0 FIXED #1333 Rate limit calls.
Clean-up duplicate functionality.
EOL whitespace removed

Changes to be committed:
	modified:   extensions/admin_ui/controllers/authentication/authentication.rb
2017-11-24 17:56:28 +10:00
Bucky Wilson
422b5d6fc5 1333: Rate Limit API - 1 in user defined value
Allow api connection every api_attempt_delay milliseconds.
Currently 50 mSec

Uses the same process as ui/admin rate limiting.

Changes to be committed:
	modified:   config.yaml
	modified:   core/main/rest/api.rb
	modified:   core/main/router/router.rb
2017-11-24 17:56:28 +10:00
Bucky Wilson
0a1da26c32 Gemfile - whitespace, added dev group: pry 2017-11-24 17:56:28 +10:00
Bucky Wilson
3fdf323f7c And then removing these lines - still no error
Error maynot be solved by the introduction of db_pool/db_timeout
Restarting - may resolve issues.
2017-11-24 17:56:28 +10:00