Introduce bruteforce settings #2095

rullzer · 2016-11-11T18:58:50Z

This adds an app with adds an admin settings. Lets the admin insert ip ranges (netmask) to exclude for throttling.

TODO:

Ignore ip ranges in throttler
Add JS tests
FIX CSS

mention-bot · 2016-11-11T18:58:52Z

@rullzer, thanks for your PR! By analyzing the history of the files in this pull request, we identified @DeepDiver1975, @blizzz and @LukasReschke to be potential reviewers.

LukasReschke · 2016-11-11T19:08:44Z

Let's add this to

server/.drone.yml

Lines 22 to 34 in 9fff4b0

    
           app-check-code: 
        
             image: nextcloudci/php7.0:php7.0-6 
        
             commands: 
        
               - ./occ app:check-code admin_audit 
        
               - ./occ app:check-code comments 
        
               - ./occ app:check-code federation 
        
               - ./occ app:check-code sharebymail 
        
               - ./occ app:check-code systemtags 
        
               - ./occ app:check-code theming 
        
               - ./occ app:check-code workflowengine 
        
             when: 
        
               matrix: 
        
                 TESTS: app-check-code

as well :)

codecov-io · 2016-11-13T07:53:56Z

Codecov Report

Merging #2095 into master will increase coverage by 0.01%.
The diff coverage is 91.89%.

@@             Coverage Diff              @@
##             master    #2095      +/-   ##
============================================
+ Coverage     53.96%   53.98%   +0.01%     
- Complexity    21266    21279      +13     
============================================
  Files          1259     1259              
  Lines         74136    74173      +37     
============================================
+ Hits          40009    40041      +32     
- Misses        34127    34132       +5

Impacted Files	Coverage Δ	Complexity Δ
lib/private/Settings/Manager.php	`44.78% <100%> (+0.34%)`	`44 <0> (ø)`	⬇️
lib/private/Security/Bruteforce/Throttler.php	`48.03% <91.66%> (+17.26%)`	`30 <12> (+13)`	⬆️
apps/comments/lib/EventHandler.php	`79.16% <0%> (-8.34%)`	`7% <0%> (ø)`

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update d56f639...e5fb478. Read the comment docs.

rullzer · 2016-11-14T13:28:52Z

@LukasReschke please have a look

rullzer · 2016-11-18T08:30:48Z

@MorrisJobke could you have a look at the crappy CSS? For some reason it wants text in order to show the trash icons

Go to admin page
Go to secrutiy tab
Add a subnet thingy
See bad icons
fix it 😉

MorrisJobke · 2016-11-18T08:59:35Z

I will have a look once I'm in the office 😉

MorrisJobke · 2016-11-18T20:25:37Z

@rullzer The security page is empty 😢

rullzer · 2016-11-19T05:48:41Z

Enable the app

MorrisJobke · 2016-11-19T15:09:17Z

Ah ... 🙈

icewind1991 · 2016-12-28T15:58:44Z

@rullzer any update here?

techc0de · 2017-03-14T00:00:07Z

Hello all,

Any ETA on this?

MorrisJobke · 2017-03-14T01:45:38Z

I rebased this, fixed the conflicts, improved the settings layout and it now looks like this:

hovered:

icewind1991 · 2017-03-15T14:40:54Z

@MorrisJobke we can still force enable apps that are in a seperate repo by bundling them for a release if needed.

rullzer · 2017-03-30T07:51:04Z

Let me rip this apart soonish.

This adds the bruteforce settings app that allows to configure (for now) subnets that are to be ignored when doing brute force analysis. This can for example be the LAN since we trust people from there. * Add app * Add php tests * Add js tests Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

Signed-off-by: Morris Jobke <hey@morrisjobke.de>

From nextcloud/server#2095 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

https://github.com/nextcloud/bruteforcesettings Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

rullzer · 2017-04-02T19:29:49Z

App in https://github.com/nextcloud/bruteforcesettings

rullzer · 2017-04-03T06:40:42Z

Ok lets get this in!

MorrisJobke · 2017-04-03T22:12:43Z

tests/karma.config.js

+				],
+				testFiles: [
+					'apps/bruteforcesettings/tests/js/IPWhitelistSpec.js'
+				]


Shouldn't this be better executed in the apps repo? Otherwise the PR there aren't checked with the tests itself.

Yes it should.

MorrisJobke

Beside the one comment this is fine 👍

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

ChristophWurst · 2017-04-04T08:42:23Z

core/shipped.json

@@ -2,6 +2,7 @@
  "shippedApps": [
    "activity",
    "admin_audit",
+    "bruteforcesettings",


@rullzer what's that used for? I don't see an app bruteforcesettings

Well it is just the list of shipped apps. I'm fine with removing that as well... if we decide to just ship it from the appstore...

Oh, didn't see your comment #2095 (comment). Now it makes sense!

Has been resolved.

rullzer added the 2. developing Work in progress label Nov 11, 2016

rullzer added this to the Nextcloud 11.0 milestone Nov 11, 2016

rullzer force-pushed the bruteforcesetttings branch from 37715af to 0385979 Compare November 14, 2016 13:16

rullzer added 3. to review Waiting for reviews enhancement and removed 2. developing Work in progress labels Nov 14, 2016

rullzer force-pushed the bruteforcesetttings branch from 0385979 to 56b33e1 Compare November 18, 2016 08:27

MorrisJobke self-assigned this Nov 18, 2016

MorrisJobke added 2. developing Work in progress and removed 3. to review Waiting for reviews labels Nov 18, 2016

rullzer force-pushed the bruteforcesetttings branch from 56b33e1 to 9e8cefb Compare November 19, 2016 20:04

rullzer modified the milestones: Nextcloud 12.0, Nextcloud 11.0 Nov 23, 2016

rullzer force-pushed the bruteforcesetttings branch from 9e8cefb to 9aaf02c Compare January 10, 2017 14:56

MorrisJobke force-pushed the bruteforcesetttings branch from 9aaf02c to 73f455d Compare March 14, 2017 01:45

MorrisJobke added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Mar 14, 2017

MorrisJobke removed their assignment Mar 14, 2017

rullzer added 2. developing Work in progress and removed 3. to review Waiting for reviews labels Mar 30, 2017

rullzer and others added 7 commits April 2, 2017 21:08

Adds security section to the admin page

dca555b

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

Respect bruteforce settings in the Throttler

be674c1

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

App is always enabled

c637ff5

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

Update App Manager test

4e0479f

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

Fix app

86022f8

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

Fixed layout of bruteforcesettings

ed00bab

Signed-off-by: Morris Jobke <hey@morrisjobke.de>

rullzer added a commit to nextcloud/bruteforcesettings that referenced this pull request Apr 2, 2017

Initial commit of the app

3c5f444

From nextcloud/server#2095 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

Move app to own repo

e09c386

https://github.com/nextcloud/bruteforcesettings Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

rullzer force-pushed the bruteforcesetttings branch from 73f455d to e09c386 Compare April 2, 2017 19:28

rullzer force-pushed the bruteforcesetttings branch 2 times, most recently from 78e79f7 to e5fb478 Compare April 3, 2017 06:39

rullzer added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Apr 3, 2017

MorrisJobke reviewed Apr 3, 2017

View reviewed changes

MorrisJobke approved these changes Apr 3, 2017

View reviewed changes

Fix tests

aee2d63

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

rullzer force-pushed the bruteforcesetttings branch from e5fb478 to aee2d63 Compare April 4, 2017 08:29

ChristophWurst previously requested changes Apr 4, 2017

View reviewed changes

LukasReschke approved these changes Apr 4, 2017

View reviewed changes

LukasReschke merged commit e0227cb into master Apr 4, 2017

LukasReschke deleted the bruteforcesetttings branch April 4, 2017 09:57

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Introduce bruteforce settings #2095

Introduce bruteforce settings #2095

rullzer commented Nov 11, 2016 •

edited by MorrisJobke

Loading

mention-bot commented Nov 11, 2016

LukasReschke commented Nov 11, 2016

codecov-io commented Nov 13, 2016 •

edited

Loading

rullzer commented Nov 14, 2016

rullzer commented Nov 18, 2016

MorrisJobke commented Nov 18, 2016

MorrisJobke commented Nov 18, 2016

rullzer commented Nov 19, 2016

MorrisJobke commented Nov 19, 2016

icewind1991 commented Dec 28, 2016

techc0de commented Mar 14, 2017

MorrisJobke commented Mar 14, 2017

icewind1991 commented Mar 15, 2017

rullzer commented Mar 30, 2017

rullzer commented Apr 2, 2017

rullzer commented Apr 3, 2017

MorrisJobke Apr 3, 2017

rullzer Apr 4, 2017

MorrisJobke left a comment

ChristophWurst Apr 4, 2017

rullzer Apr 4, 2017

ChristophWurst Apr 4, 2017

Introduce bruteforce settings #2095

Introduce bruteforce settings #2095

Conversation

rullzer commented Nov 11, 2016 • edited by MorrisJobke Loading

mention-bot commented Nov 11, 2016

LukasReschke commented Nov 11, 2016

codecov-io commented Nov 13, 2016 • edited Loading

Codecov Report

rullzer commented Nov 14, 2016

rullzer commented Nov 18, 2016

MorrisJobke commented Nov 18, 2016

MorrisJobke commented Nov 18, 2016

rullzer commented Nov 19, 2016

MorrisJobke commented Nov 19, 2016

icewind1991 commented Dec 28, 2016

techc0de commented Mar 14, 2017

MorrisJobke commented Mar 14, 2017

icewind1991 commented Mar 15, 2017

rullzer commented Mar 30, 2017

rullzer commented Apr 2, 2017

rullzer commented Apr 3, 2017

MorrisJobke Apr 3, 2017

Choose a reason for hiding this comment

rullzer Apr 4, 2017

Choose a reason for hiding this comment

MorrisJobke left a comment

Choose a reason for hiding this comment

ChristophWurst Apr 4, 2017

Choose a reason for hiding this comment

rullzer Apr 4, 2017

Choose a reason for hiding this comment

ChristophWurst Apr 4, 2017

Choose a reason for hiding this comment

rullzer commented Nov 11, 2016 •

edited by MorrisJobke

Loading

codecov-io commented Nov 13, 2016 •

edited

Loading