Skip to content

Implementing trusted_proxies CIDR notation capability for IPv6 #12535

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.

Sign up for GitHub

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

Closed
olivermg wants to merge 31 commits into from
Closed

Implementing trusted_proxies CIDR notation capability for IPv6 #12535

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
4dd4379
Adding IpAddress handling utility classes in OC\Net namespace
olivermg Oct 31, 2018
5efc12f
Working on IpAddress classes for CIDR
olivermg Oct 31, 2018
54c3694
Merge branch 'master' of github.com:nextcloud/server into feature/655…
olivermg Nov 4, 2018
9c98e43
Adding test for IpAddressFactory
olivermg Nov 4, 2018
fc7b744
adding tests to IpAddressV4Test.php
olivermg Nov 5, 2018
9674d3b
Merge branch 'master' of github.com:nextcloud/server into feature/655…
olivermg Nov 12, 2018
7b9f5bc
adding tests for IpAddressV4
olivermg Nov 12, 2018
587025a
renaming tests
olivermg Nov 12, 2018
8d35b0e
adding tests for IpAddressV6
olivermg Nov 12, 2018
5fa3396
adding tests for localhost
olivermg Nov 12, 2018
af610cd
moving common methods from IPAddressV[46] to AbstractIpAddress
olivermg Nov 12, 2018
a5503ad
adding author to Request.php
olivermg Nov 12, 2018
cf554e0
removing empty setUp & tearDown methods from tests
olivermg Nov 12, 2018
0920691
shrinking IIpAddress interface to sensible minimum
olivermg Nov 12, 2018
b26e862
Merge branch 'master' of github.com:nextcloud/server into feature/655…
olivermg Nov 19, 2018
b4a5d8f
remove matchesTrustedProxy function from Request.php
olivermg Nov 19, 2018
02c6ed1
adding license headers to new source files
olivermg Nov 19, 2018
ad76224
updating config.sample.php to reflect IPv6 CIDR notation
olivermg Nov 19, 2018
361871d
adding function header comments
olivermg Nov 19, 2018
efc02c6
adding license file headers to test files
olivermg Nov 19, 2018
29488ec
Merge branch 'master' of github.com:nextcloud/server into feature/655…
olivermg Nov 19, 2018
caf3df2
updating license statements in files of OC\Net
olivermg Nov 19, 2018
4ad17fc
pushing @since in \OC\Net\IIpAddress to 16.0.0
olivermg Nov 19, 2018
9b66b4f
moving IIpAddress and IpAddressFactory to OCP namespace
olivermg Nov 20, 2018
36aec3f
adding @author lines
olivermg Nov 20, 2018
811befa
removing obsolete members from concrete IpAddressV[46] classes
olivermg Nov 25, 2018
f82f4fb
introduce IIpAddressFactory and move IpAddressFactory to OC namespace
olivermg Nov 25, 2018
733b416
Merge branch 'master' of github.com:olivermg/server into feature/6550…
olivermg Nov 27, 2018
638d876
Merge branch 'master' of github.com:nextcloud/server into feature/655…
olivermg Nov 27, 2018
bc413ea
inject IIpAddressFactory into Request
olivermg Nov 27, 2018
a8f7ea4
check if an IIpAddressFactory exists in Request
olivermg Nov 27, 2018
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
Prev Previous commit
Next Next commit
adding @author lines 
Signed-off-by: Oliver Wegner <[email protected]>
  • Loading branch information
@olivermg
olivermg committed Nov 20, 2018
commit 36aec3f890e88dd28555c0c907283cf3eae7bbcb
2 changes: 2 additions & 0 deletions lib/private/Net/AbstractIpAddress.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
/**
* @copyright Copyright (c) 2018, Oliver Wegner ([email protected])
*
* @author Oliver Wegner <[email protected]>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
Expand Down
2 changes: 2 additions & 0 deletions lib/private/Net/IpAddressV4.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
/**
* @copyright Copyright (c) 2018, Oliver Wegner ([email protected])
*
* @author Oliver Wegner <[email protected]>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
Expand Down
2 changes: 2 additions & 0 deletions lib/private/Net/IpAddressV6.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
/**
* @copyright Copyright (c) 2018, Oliver Wegner ([email protected])
*
* @author Oliver Wegner <[email protected]>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
Expand Down
2 changes: 2 additions & 0 deletions lib/public/Net/IIpAddress.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
/**
* @copyright Copyright (c) 2018, Oliver Wegner ([email protected])
*
* @author Oliver Wegner <[email protected]>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
Expand Down
2 changes: 2 additions & 0 deletions lib/public/Net/IpAddressFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
/**
* @copyright Copyright (c) 2018, Oliver Wegner ([email protected])
*
* @author Oliver Wegner <[email protected]>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
Expand Down
2 changes: 2 additions & 0 deletions tests/lib/Net/IpAddressFactoryTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
/**
* @copyright Copyright (c) 2018, Oliver Wegner ([email protected])
*
* @author Oliver Wegner <[email protected]>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
Expand Down
2 changes: 2 additions & 0 deletions tests/lib/Net/IpAddressV4Test.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
/**
* @copyright Copyright (c) 2018, Oliver Wegner ([email protected])
*
* @author Oliver Wegner <[email protected]>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
Expand Down
2 changes: 2 additions & 0 deletions tests/lib/Net/IpAddressV6Test.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
/**
* @copyright Copyright (c) 2018, Oliver Wegner ([email protected])
*
* @author Oliver Wegner <[email protected]>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
Expand Down