From 37c03f2bda88582f97941903d897317390bdda73 Mon Sep 17 00:00:00 2001 From: Louis Nyffenegger Date: Fri, 28 Oct 2016 14:29:23 +1100 Subject: [PATCH 01/12] Update README fix URL to the wiki --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2e5929ee..4802401b 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ Scumblr uses the [Workflowable gem](https://github.com/Netflix/Workflowable) to ## How do I use Scumblr? -Scumblr is a web application based on Ruby on Rails. In order to get started, you'll need to setup / deploy a Scumblr environment and configure it to search and analyze the things you care about. Setup information is described in great detail on the [Wiki](https://github.com/Netflix/Scumblr2/wiki). +Scumblr is a web application based on Ruby on Rails. In order to get started, you'll need to setup / deploy a Scumblr environment and configure it to search and analyze the things you care about. Setup information is described in great detail on the [Wiki](https://github.com/Netflix/Scumblr/wiki). You'll optionally want to setup and configure workflows so that you can track the status of identified results through your triage process. From 8ad2caf9535bf8d2a0c222aa29cfeacb526a0587 Mon Sep 17 00:00:00 2001 From: Andrew Hoernecke Date: Fri, 28 Oct 2016 14:36:00 -0700 Subject: [PATCH 02/12] Update to sidekiq gems --- Gemfile.lock | 40 +++++++++------------------------------- 1 file changed, 9 insertions(+), 31 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 721740dc..cb4c80a8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -101,23 +101,6 @@ GEM slop (~> 3.6) callsite (0.0.11) cancan (1.6.10) - celluloid (0.17.3) - celluloid-essentials - celluloid-extras - celluloid-fsm - celluloid-pool - celluloid-supervision - timers (>= 4.1.1) - celluloid-essentials (0.20.5) - timers (>= 4.1.1) - celluloid-extras (0.20.5) - timers (>= 4.1.1) - celluloid-fsm (0.20.5) - timers (>= 4.1.1) - celluloid-pool (0.20.5) - timers (>= 4.1.1) - celluloid-supervision (0.20.6) - timers (>= 4.1.1) chronic (0.10.2) climate_control (0.0.3) activesupport (>= 3.0) @@ -133,7 +116,8 @@ GEM coffee-script-source (1.7.1) columnize (0.8.9) commonjs (0.2.7) - connection_pool (2.0.0) + concurrent-ruby (1.0.2) + connection_pool (2.2.0) crack (0.1.8) database_cleaner (1.3.0) debug_inspector (0.0.2) @@ -206,7 +190,6 @@ GEM hashie (3.4.6) highline (1.7.8) hike (1.2.3) - hitimes (1.2.4) http (0.6.2) http_parser.rb (~> 0.6.0) http-cookie (1.0.2) @@ -366,8 +349,6 @@ GEM trollop (>= 1.16.2) redcarpet (3.3.4) redis (3.3.1) - redis-namespace (1.5.1) - redis (~> 3.0, >= 3.0.4) ref (2.0.0) responders (2.2.0) railties (>= 4.2.0, < 5.1) @@ -415,14 +396,13 @@ GEM shoulda-context (1.2.1) shoulda-matchers (2.6.2) activesupport (>= 3.0.0) - sidekiq (3.0.2) - celluloid (>= 0.15.2) - connection_pool (>= 2.0.0) - json - redis (>= 3.0.6) - redis-namespace (>= 1.3.1) - sidekiq-status (0.5.0) - sidekiq (>= 2.7, < 3.1) + sidekiq (4.2.3) + concurrent-ruby (~> 1.0) + connection_pool (~> 2.2, >= 2.2.0) + rack-protection (>= 1.5.0) + redis (~> 3.2, >= 3.2.1) + sidekiq-status (0.6.0) + sidekiq (>= 2.7) signet (0.7.2) addressable (~> 2.3) faraday (~> 0.9) @@ -460,8 +440,6 @@ GEM thor (0.19.1) thread_safe (0.3.5) tilt (1.4.1) - timers (4.1.1) - hitimes trollop (2.1.2) turbolinks (2.2.2) coffee-rails From 02fa91d290dad6c94f4e1ba3d58165b0cd5344d4 Mon Sep 17 00:00:00 2001 From: dferraro Date: Sat, 29 Oct 2016 13:59:22 -0700 Subject: [PATCH 03/12] Update to stylesheet for small screens --- app/assets/stylesheets/application.css.scss | 84 +++++++++++++++++---- 1 file changed, 71 insertions(+), 13 deletions(-) diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss index 61fe9852..fbcb18f8 100644 --- a/app/assets/stylesheets/application.css.scss +++ b/app/assets/stylesheets/application.css.scss @@ -355,10 +355,9 @@ background: linear-gradient(to left, #141E30 , #243B55); /* W3C, IE 10+/ Edge, F .top-bar-section ul.left li.name{ display: inline-block; - color: #fff!important; + color: #fff; text-decoration: none; - background: transparent; /* fallback for old browsers */ - + background: transparent; /* fallback for old browsers */ } .top-bar-section ul.left li.name::after { @@ -374,11 +373,35 @@ background: linear-gradient(to left, #141E30 , #243B55); /* W3C, IE 10+/ Edge, F color: #ffffff!important; } -.top-bar-section ul.left li.name.active::after { - content: ''; - display: block; - width: 100%; - height: 4px; +@media screen and (max-width: 1250px) { + + .top-bar-section ul.left li.name{ + display: block!important; + } + + .top-bar .title-area .name { + border-bottom: 1px solid #fff; + } + +nav.top-bar .top-bar-section li:not(.has-form) a:not(.button) { + line-height: 25px!important; + } + + .top-bar-section .name { + height: auto; + } + + .top-bar-section .divider { + border-top: solid 1px #fff!important; + } + +} + +.top-bar-section ul.left li.name{ + display: inline-block; + color: #fff; + text-decoration: none; + background: transparent; /* fallback for old browsers */ } @@ -446,11 +469,11 @@ table tr th, table tr td { z-index: 105 !important; } -nav.top-bar { - margin-bottom: 0.9375rem; - background: #141E30; /* fallback for old browsers */ - background: -webkit-linear-gradient(to left, #141E30 , #243B55); /* Chrome 10-25, Safari 5.1-6 */ - background: linear-gradient(to left, #141E30 , #243B55); /* W3C, IE 10+/ Edge, Firefox 16+, Chrome 26+, Opera 12+, Safari 7+ */ +nav.top-bar, .top-bar.expanded .title-area { +/* margin-bottom: 0.9375rem;*/ + background: #141E30!important; /* fallback for old browsers */ + background: -webkit-linear-gradient(to left, #141E30 , #243B55)!important; /* Chrome 10-25, Safari 5.1-6 */ + background: linear-gradient(to left, #141E30 , #243B55)!important; /* W3C, IE 10+/ Edge, Firefox 16+, Chrome 26+, Opera 12+, Safari 7+ */ } .top-bar-section li:not(.has-form) a:not(.button) { @@ -458,6 +481,19 @@ nav.top-bar { background: transparent!important; } +@media only screen and (min-width: 1250px) { + +.top-bar-section .has-dropdown.hover > .dropdown, .top-bar-section .has-dropdown.not-click:hover > .dropdown { + top: 55px; + } +} + +@media only screen and (min-width: 64.063em){ + .large-9 { + width: 75%; + padding-right: 0!important; + } +} nav.warning-bar @@ -478,6 +514,16 @@ nav.top-bar ul li.has-dropdown ul.dropdown li background-color: #243B55 !important; } +.top-bar-section .dropdown li.title h5 a { + color: #008cba!important; + font-size: 14px; + padding-bottom: 0; + padding-top: 15px; + font-weight: 700; + text-transform: uppercase; + display: block; +} + nav.top-bar ul li.has-dropdown ul.dropdown li label { background-color: #243B55 !important; @@ -496,6 +542,10 @@ nav label } +.tab-bar, .large-9.columns a.button { + margin-top: 0.9375rem!important; +} + .tab-bar h1 span.small-heading { font-size: 11px; @@ -560,6 +610,7 @@ nav label margin-right: 5px; } + button.adjust_top { position:relative !important; @@ -640,6 +691,13 @@ button.adjust_top top: .9em; } +table { + background: white; + margin-bottom: 1.25rem; + margin-top: 0.9375rem!important; + border: solid 1px #dddddd; +} + table button,table .button { margin-bottom: 0px; From 2b48be51514b5e42dd5e09bfb1c2811e20b8a5fb Mon Sep 17 00:00:00 2001 From: Scott Behrens Date: Tue, 1 Nov 2016 11:35:31 -0400 Subject: [PATCH 04/12] Update README.md --- README.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/README.md b/README.md index 4802401b..ac597030 100644 --- a/README.md +++ b/README.md @@ -74,6 +74,19 @@ Take a look at the [wiki](https://github.com/Netflix/Scumblr/wiki) for detailed ## Release History ## +**Version 2.0.1** - "O'Reilly Security Edition" - *November 2nd, 2016* + +This is a minor release that addresses a few bugs and adds some new features + +* releasing curl 2 security task added which includes a number of new features: +* * response Metadata: New option to allow you to arbitrarily define metadata to collect from http responses (think CSP policies, Server headers) +* * Option: Negative searching +* * Option: Strip path off of result (useful for sitemaps that may have trailing images, etc.) +* Abstract view for response metadata with filtering and pagination +* A number of bug fixes in views +* Fixed an issue with curl security task and thread safety +* Updated stylesheets for better views on small screens + **Version 2.0** - "Dirty Laundry" - *October 12th, 2016* This is a major release that addresses a number of bugs and adds many new features From fb1998c20ae072c30ad9ae24972dd08bd35094b1 Mon Sep 17 00:00:00 2001 From: Scott Behrens Date: Tue, 1 Nov 2016 11:37:25 -0400 Subject: [PATCH 05/12] Update README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index ac597030..bed60421 100644 --- a/README.md +++ b/README.md @@ -79,9 +79,9 @@ Take a look at the [wiki](https://github.com/Netflix/Scumblr/wiki) for detailed This is a minor release that addresses a few bugs and adds some new features * releasing curl 2 security task added which includes a number of new features: -* * response Metadata: New option to allow you to arbitrarily define metadata to collect from http responses (think CSP policies, Server headers) -* * Option: Negative searching -* * Option: Strip path off of result (useful for sitemaps that may have trailing images, etc.) + > response Metadata: New option to allow you to arbitrarily define metadata to collect from http responses (think CSP policies, Server headers) + > Option: Negative searching + > Option: Strip path off of result (useful for sitemaps that may have trailing images, etc.) * Abstract view for response metadata with filtering and pagination * A number of bug fixes in views * Fixed an issue with curl security task and thread safety From ecc46220a377e4a265d34478c59b2818e00da89b Mon Sep 17 00:00:00 2001 From: Scott Behrens Date: Tue, 1 Nov 2016 11:37:47 -0400 Subject: [PATCH 06/12] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index bed60421..be070196 100644 --- a/README.md +++ b/README.md @@ -79,9 +79,11 @@ Take a look at the [wiki](https://github.com/Netflix/Scumblr/wiki) for detailed This is a minor release that addresses a few bugs and adds some new features * releasing curl 2 security task added which includes a number of new features: + > response Metadata: New option to allow you to arbitrarily define metadata to collect from http responses (think CSP policies, Server headers) > Option: Negative searching > Option: Strip path off of result (useful for sitemaps that may have trailing images, etc.) + * Abstract view for response metadata with filtering and pagination * A number of bug fixes in views * Fixed an issue with curl security task and thread safety From b7c9e015c627169f42076f383322efe235a7d466 Mon Sep 17 00:00:00 2001 From: Scott Behrens Date: Tue, 1 Nov 2016 11:38:10 -0400 Subject: [PATCH 07/12] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index be070196..942369b2 100644 --- a/README.md +++ b/README.md @@ -81,7 +81,9 @@ This is a minor release that addresses a few bugs and adds some new features * releasing curl 2 security task added which includes a number of new features: > response Metadata: New option to allow you to arbitrarily define metadata to collect from http responses (think CSP policies, Server headers) + > Option: Negative searching + > Option: Strip path off of result (useful for sitemaps that may have trailing images, etc.) * Abstract view for response metadata with filtering and pagination From 8749d1af261065c9776ecd908588520885ea11da Mon Sep 17 00:00:00 2001 From: Scott Behrens Date: Tue, 1 Nov 2016 11:38:35 -0400 Subject: [PATCH 08/12] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 942369b2..7de103e0 100644 --- a/README.md +++ b/README.md @@ -78,9 +78,9 @@ Take a look at the [wiki](https://github.com/Netflix/Scumblr/wiki) for detailed This is a minor release that addresses a few bugs and adds some new features -* releasing curl 2 security task added which includes a number of new features: +* Releasing curl 2 security task added which includes a number of new features: - > response Metadata: New option to allow you to arbitrarily define metadata to collect from http responses (think CSP policies, Server headers) + > Response Metadata: New option to allow you to arbitrarily define metadata to collect from http responses (think CSP policies, Server headers) > Option: Negative searching From 025f55d684f5e4d861bbc381ce279269bff313e0 Mon Sep 17 00:00:00 2001 From: Scott Behrens Date: Tue, 1 Nov 2016 11:39:29 -0400 Subject: [PATCH 09/12] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7de103e0..2c0646a0 100644 --- a/README.md +++ b/README.md @@ -85,7 +85,7 @@ This is a minor release that addresses a few bugs and adds some new features > Option: Negative searching > Option: Strip path off of result (useful for sitemaps that may have trailing images, etc.) - + * Abstract view for response metadata with filtering and pagination * A number of bug fixes in views * Fixed an issue with curl security task and thread safety From 68780295dbf770cf68197d17576c68dc72f38cec Mon Sep 17 00:00:00 2001 From: Scott Behrens Date: Tue, 1 Nov 2016 11:39:57 -0400 Subject: [PATCH 10/12] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 2c0646a0..0e2f7a87 100644 --- a/README.md +++ b/README.md @@ -86,6 +86,7 @@ This is a minor release that addresses a few bugs and adds some new features > Option: Strip path off of result (useful for sitemaps that may have trailing images, etc.) + * Abstract view for response metadata with filtering and pagination * A number of bug fixes in views * Fixed an issue with curl security task and thread safety From 4e66f245172efb4e45040f1344cb39c07304424e Mon Sep 17 00:00:00 2001 From: Scott Behrens Date: Tue, 1 Nov 2016 11:40:30 -0400 Subject: [PATCH 11/12] Update README.md --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index 0e2f7a87..ea7e68f8 100644 --- a/README.md +++ b/README.md @@ -86,8 +86,6 @@ This is a minor release that addresses a few bugs and adds some new features > Option: Strip path off of result (useful for sitemaps that may have trailing images, etc.) - -* Abstract view for response metadata with filtering and pagination * A number of bug fixes in views * Fixed an issue with curl security task and thread safety * Updated stylesheets for better views on small screens From eeff6ad56d7910b02f06e7ad87e901fc1aea8577 Mon Sep 17 00:00:00 2001 From: Scott Behrens Date: Tue, 1 Nov 2016 11:40:58 -0400 Subject: [PATCH 12/12] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index ea7e68f8..2c0646a0 100644 --- a/README.md +++ b/README.md @@ -86,6 +86,7 @@ This is a minor release that addresses a few bugs and adds some new features > Option: Strip path off of result (useful for sitemaps that may have trailing images, etc.) +* Abstract view for response metadata with filtering and pagination * A number of bug fixes in views * Fixed an issue with curl security task and thread safety * Updated stylesheets for better views on small screens