Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Site api #135

Merged
merged 130 commits into from
Mar 26, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
130 commits
Select commit Hold shift + click to select a range
fb3ca40
adding wait class to test report downloads during nightly build
Feb 11, 2015
db2148f
adding a few inline comments for documentation.
Feb 11, 2015
ac8f6fe
documentation for default timeout and polling interval times.
Feb 11, 2015
c62f9cf
more documentation
sgreen-r7 Feb 11, 2015
d701790
initial workings for integration method
sgreen-r7 Feb 11, 2015
f64e03e
temp fix to allow tests to run on ruby 2.0
sgreen-r7 Feb 11, 2015
b739b43
Added utility methods on Site to add or remove scan targets
Feb 14, 2015
ad8f7f6
merge with rapid7 master
sgreen-r7 Feb 17, 2015
5eba755
setup to use retry_count for timeout failures.
sgreen-r7 Feb 17, 2015
2e2d452
Gem site credentials updated to use 2.1 api
ugohil-r7 Feb 18, 2015
ad9a239
Created site credential object from hash
ugohil-r7 Feb 18, 2015
2f04aee
JsonSerializer mixin as a possible solution for crud ops on api
dcastellanos-r7 Feb 19, 2015
9173097
Re-add site credentials creation
dcastellanos-r7 Feb 19, 2015
0c86508
Updating site.rb to interact with the new 2.1 APIs.
gperez-r7 Feb 20, 2015
7427363
Merge branch 'site-api' of github.com:rapid7/nexpose-client into site…
gperez-r7 Feb 20, 2015
f06bbde
Improving scan target methods and implementing to_hash and from_hash …
gperez-r7 Feb 23, 2015
6e4cb2c
Discovery config for site 2.1
ugohil-r7 Feb 24, 2015
255d03d
rescuse more errors for better error output on failures.
sgreen-r7 Feb 24, 2015
f389df6
Put nil check for discovery config
ugohil-r7 Feb 24, 2015
8ff292d
text update for api error output
sgreen-r7 Feb 24, 2015
2a3ed3e
Introduce scope of credential
ugohil-r7 Feb 25, 2015
d8e1980
Added tags support to site api
mrongali Feb 25, 2015
cff61d5
Using existing discovery.rb file instead of new discovery_Config file…
ugohil-r7 Feb 25, 2015
6795d3c
Gem changes for alerts, users and sites
dcastellanos-r7 Feb 25, 2015
23bceb7
Fixed refrence of module in site credentials
ugohil-r7 Feb 25, 2015
f4b21f9
hmm need to learn how to reference constant in ruby
ugohil-r7 Feb 25, 2015
f771ea8
adding for_judgement method which will accept any proc and poll for i…
sgreen-r7 Feb 26, 2015
85bf211
Web Auth Html header for site 2.1 api
ugohil-r7 Feb 26, 2015
397e2c6
Add validation to Alert initializers
dcastellanos-r7 Feb 26, 2015
f01b4a3
mild cleanup while looking for feedback
sgreen-r7 Feb 26, 2015
639f54d
merge from rapid7/nexpose-client master
sgreen-r7 Feb 26, 2015
769402f
Http form for site 2.1 api
ugohil-r7 Feb 26, 2015
6a4bd60
Removed old site credential file
ugohil-r7 Feb 26, 2015
043eaa2
Clean up Alert definitions
dcastellanos-r7 Feb 27, 2015
222974d
Added organization to site api
mrongali Feb 27, 2015
71cb865
Fix for web credentials
ugohil-r7 Feb 27, 2015
c6fcd8e
remove retry_count nil check, and just convert to_i
sgreen-r7 Feb 27, 2015
900ad76
keyword name update for wait argument
sgreen-r7 Feb 27, 2015
39187ef
removing all begin/ends which are not needed
sgreen-r7 Feb 27, 2015
9182ccd
removing un-needed return.
sgreen-r7 Feb 28, 2015
e0b652c
Added missing filter for discovery connection
ugohil-r7 Feb 28, 2015
d6d7d32
renamed ready method, updated nsc keyword to nexpose_connection, rena…
sgreen-r7 Feb 28, 2015
392dee3
up max lines to 120 for hound ci.
sgreen-r7 Feb 28, 2015
625c4ee
removing whitespace
sgreen-r7 Feb 28, 2015
478e01e
misc style cleanup
sgreen-r7 Feb 28, 2015
d3806b7
merge from rapid7 master
sgreen-r7 Mar 3, 2015
465b52c
Fixed helper methods for excluded_targets were adding hosts incorrect…
dcastellanos-r7 Mar 3, 2015
5af21a6
Remove Ruby 1.9.3 support, require Ruby 2.1.5
gschneider-r7 Mar 3, 2015
52f377c
Fixed Organization url issue
mrongali Mar 4, 2015
edf0bba
remove indent from methods in private
sgreen-r7 Mar 4, 2015
a24792f
remove space from after module definition
sgreen-r7 Mar 4, 2015
c6d81e6
Correctly assigning excluded ip/host targets to exclude collection in…
dcastellanos-r7 Mar 5, 2015
8109d14
Merge branch 'site-api' of r7:rapid7/nexpose-client into site-api
dcastellanos-r7 Mar 5, 2015
782f3ba
Additional changes for scan schedules
gperez-r7 Mar 7, 2015
994ca40
Merge branch 'site-api' of github.com:rapid7/nexpose-client into site…
gperez-r7 Mar 7, 2015
7015988
Pin Rex to version 2.0.7
gschneider-r7 Mar 5, 2015
e978204
Updating the Schedule class.
gperez-r7 Mar 10, 2015
03a2a74
Fixing logic for building hash for Schedule object.
gperez-r7 Mar 11, 2015
15a6138
merge from fork into maint/deprecate_ruby_19
sgreen-r7 Mar 11, 2015
846c5eb
remove compatibility for ruby2.0 syntax of keyword arguments.
sgreen-r7 Mar 11, 2015
a8a7c8a
Added auto engine selection enabled support to site api
mrongali Mar 16, 2015
ed82c60
Fixed 'auto engine selection was not saved' issue
mrongali Mar 17, 2015
fad8d37
Update nexpose.gemspec
gschneider-r7 Mar 17, 2015
3da03f4
Update nexpose.gemspec
gschneider-r7 Mar 17, 2015
02f823f
Merge branch 'staging/v1' into maint/deprecate_ruby_19
gschneider-r7 Mar 17, 2015
2839b12
Merge pull request #134 from rapid7/maint/deprecate_ruby_19
gschneider-r7 Mar 17, 2015
9e73742
Merge branch 'staging/v1' into site-api
gperez-r7 Mar 17, 2015
f7e10af
Untracking RubyMine launch files.
gperez-r7 Mar 17, 2015
5990022
Addresses some of hound's complaints
gschneider-r7 Mar 17, 2015
40c725e
Update rspec tests for site to use include_asset
gschneider-r7 Mar 17, 2015
a803b36
Collapse `include_*` methods and add deprecated methods
gschneider-r7 Mar 17, 2015
d1ae964
Update alert.rb
sgreen-r7 Mar 18, 2015
b1b31a1
Oracle sid field is save as database field in Iaccount
ugohil-r7 Mar 18, 2015
852e806
Merge pull request #139 from sgreen-r7/wait_update
gschneider-r7 Mar 18, 2015
254f982
test commit to see if i have permissions
mhughes-r7 Mar 19, 2015
ea6ccb4
Add support for ad-hoc scans with schedules
mhughes-r7 Mar 19, 2015
4af2b69
Removing duplicate property declaration in hash object.
gperez-r7 Mar 19, 2015
0828aa8
Modify VulnFilter and ScanFilter classes to ensure constructor argume…
gperez-r7 Mar 19, 2015
e48eb42
Merge pull request #137 from rapid7/site_api_alert_fix_some_hound_com…
sgreen-r7 Mar 19, 2015
8353694
Changing how the default value for privilege type is set when creatin…
gperez-r7 Mar 19, 2015
4c407bb
Merge branch 'site-api' of github.com:rapid7/nexpose-client into site…
gperez-r7 Mar 19, 2015
9380d0a
Set version for 1.0 release
gschneider-r7 Mar 20, 2015
e0acae5
Merge branch 'staging/v1' into site-api
gschneider-r7 Mar 20, 2015
cf4c0fb
Merge pull request #138 from rapid7/site_api_collapse_asset_methods
dcastellanos-r7 Mar 20, 2015
33eb191
Fixing an issue where the scan targets are not correctly converted fr…
gperez-r7 Mar 20, 2015
ef3bf48
Merge branch 'site-api' of github.com:rapid7/nexpose-client into site…
gperez-r7 Mar 20, 2015
a91d6e8
Ignoring IDE file artifacts.
gperez-r7 Mar 20, 2015
6daec39
Adding getter and setters for included/excluded addresses and asset g…
gperez-r7 Mar 20, 2015
03d6593
Adding documentation for new getter and setters.
gperez-r7 Mar 20, 2015
8ea2538
Add support for ad-hoc scans with schedules
mhughes-r7 Mar 20, 2015
f59c878
Add support for ad-hoc scans with schedules
mhughes-r7 Mar 20, 2015
28b5196
Add support for ad-hoc scans with schedules
mhughes-r7 Mar 20, 2015
c5bb006
test commit to see if i have permissions
mhughes-r7 Mar 19, 2015
692d308
Add support for ad-hoc scans with schedules
mhughes-r7 Mar 19, 2015
c4184a2
Add support for ad-hoc scans with schedules
mhughes-r7 Mar 20, 2015
68faf78
Add support for ad-hoc scans with schedules
mhughes-r7 Mar 20, 2015
b31deb1
Add support for ad-hoc scans with schedules
mhughes-r7 Mar 20, 2015
b07db1d
Add support for ad-hoc scans with schedules
mhughes-r7 Mar 20, 2015
2129b59
Merge remote-tracking branch 'origin/site-api-adhoc-schedule' into si…
mhughes-r7 Mar 20, 2015
e7fbdde
Add support for ad-hoc scans with schedules
mhughes-r7 Mar 20, 2015
3240684
Add method to reverse engine and add SharedSecret class
Mar 20, 2015
fb1afb3
Remove old code
Mar 20, 2015
e145bdd
Michael Hughes fix for parsing the IPAddress range
ugohil-r7 Mar 20, 2015
c4713ca
Address hound comments
Mar 20, 2015
0a043e4
Address more hound comments
Mar 20, 2015
de936b0
Add shared_secret to nexpose.rb
Mar 20, 2015
3ecd576
Update after testing with cucumber
Mar 20, 2015
a65a15b
Add server port field to Alerts, splitting it up from server string.
dcastellanos-r7 Mar 21, 2015
0917f49
Merge pull request #141 from abunn-r7/bidirectional_engines
abunn-r7 Mar 23, 2015
f7b47ca
Update engine.rb
abunn-r7 Mar 23, 2015
419d035
Update engine.rb#reverse_engine_connection
abunn-r7 Mar 23, 2015
d1d757b
Update adhoc schedules to support force parameter
mhughes-r7 Mar 24, 2015
4fedde9
test commit to see if i have permissions
mhughes-r7 Mar 19, 2015
1475254
Add support for ad-hoc scans with schedules
mhughes-r7 Mar 19, 2015
c6df1d3
Add support for ad-hoc scans with schedules
mhughes-r7 Mar 20, 2015
312329a
Add support for ad-hoc scans with schedules
mhughes-r7 Mar 20, 2015
29112ac
Add support for ad-hoc scans with schedules
mhughes-r7 Mar 20, 2015
b6daafb
Add support for ad-hoc scans with schedules
mhughes-r7 Mar 20, 2015
77f1ded
Update adhoc schedules to support force parameter
mhughes-r7 Mar 24, 2015
5f302bd
Merge remote-tracking branch 'origin/site-api-adhoc-schedule' into si…
mhughes-r7 Mar 24, 2015
3353498
Fix error with scan_device_with_schedule
mhughes-r7 Mar 24, 2015
9239c25
Clean up code based on rubocop/hound output
mhughes-r7 Mar 24, 2015
f002ebf
MOB-149: Add support for mobile powerhshell and office 365 connection…
rtaylor-r7 Mar 24, 2015
f7e271c
Address some hound comments on whitespace
gschneider-r7 Mar 24, 2015
c4d7cc2
Remove stray semicolon
gschneider-r7 Mar 25, 2015
9499ce6
Merge pull request #144 from rapid7/mobile
gschneider-r7 Mar 25, 2015
6519729
cherry-pick: Send the engine-id when calling DiscoveryConnection#save
erran Mar 25, 2015
d15a91b
Merge pull request #145 from rapid7/support-engine-id-in-discovery-in…
sgreen-r7 Mar 25, 2015
54ed13f
Merge pull request #142 from rapid7/site-api-adhoc-schedule
gschneider-r7 Mar 25, 2015
2f3f6bb
Merge branch 'master' into site-api
gperez-r7 Mar 25, 2015
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,6 @@ coverage
# YARD artifacts
doc/
.yardoc/

# IDE artifacts
.idea/
4 changes: 1 addition & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
language: ruby
rvm:
- 1.9.3
- 2.0.0
- 2.1.0
- 2.1.5
- 2.2.0
script: bundle exec rspec --color --format=documentation
addons:
Expand Down
12 changes: 8 additions & 4 deletions lib/nexpose.rb
Original file line number Diff line number Diff line change
Expand Up @@ -57,25 +57,27 @@
require 'ipaddr'
require 'json'
require 'cgi'
require 'nexpose/api'
require 'nexpose/json_serializer'
require 'nexpose/error'
require 'nexpose/util'
require 'nexpose/alert'
require 'nexpose/ajax'
require 'nexpose/api'
require 'nexpose/api_request'
require 'nexpose/asset'
require 'nexpose/common'
require 'nexpose/console'
require 'nexpose/credential'
require 'nexpose/site_credential'
require 'nexpose/site_credentials'
require 'nexpose/shared_credential'
require 'nexpose/web_credentials'
require 'nexpose/data_table'
require 'nexpose/device'
require 'nexpose/discovery'
require 'nexpose/discovery/filter'
require 'nexpose/engine'
require 'nexpose/external'
require 'nexpose/filter'
require 'nexpose/discovery'
require 'nexpose/discovery/filter'
require 'nexpose/global_settings'
require 'nexpose/group'
require 'nexpose/dag'
Expand All @@ -87,6 +89,7 @@
require 'nexpose/role'
require 'nexpose/scan'
require 'nexpose/scan_template'
require 'nexpose/shared_secret'
require 'nexpose/silo'
require 'nexpose/silo_profile'
require 'nexpose/site'
Expand All @@ -100,6 +103,7 @@
require 'nexpose/connection'
require 'nexpose/maint'
require 'nexpose/version'
require 'nexpose/wait'

module Nexpose

Expand Down
Loading