Skip to content

Merge upstream master (ruby-ldap/ruby-net-ldap) #1

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

Merged
merged 195 commits into from
Jul 10, 2019
Merged

Merge upstream master (ruby-ldap/ruby-net-ldap) #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
195 commits
Select commit Hold shift + click to select a range
a83fb32
Server strings are always UTF-8
cmdrclueless Aug 25, 2015
04125c7
Correctly encode to UTF-8 when possible
cmdrclueless Aug 25, 2015
b3e67d3
Raise Net::LDAP::ConnectionRefusedError when new connection is refused.
satoryu Aug 27, 2015
4f0f4b2
Raising Net::LDAP::ConnectionRefusedError, shows deprecation warning.
satoryu Aug 28, 2015
d20ee69
ConnectionRefusedError does not change the original error message
satoryu Aug 28, 2015
b0bf551
obscure auth password upon #inspect, added test, closes #216
astockwell Sep 17, 2015
02ec36e
fixed oversight bug where inspecting Net::LDAP with anonymous auth re…
astockwell Sep 17, 2015
49c0265
Merge pull request #217 from astockwell/feature/obscure_auth
jch Sep 17, 2015
edfa759
Merge branch 'master' into use_connection_refused_error
satoryu Sep 18, 2015
b4a3bd2
Capture the result of stderr to check the warning message.
satoryu Sep 18, 2015
4abe573
Merge pull request #213 from satoryu/use_connection_refused_error
jch Sep 18, 2015
625674e
Merge pull request #212 from cmdrclueless/utf8_strings
jch Sep 18, 2015
9be7363
add script/changelog
jch Sep 18, 2015
f45e7ff
bump version 0.12
jch Sep 18, 2015
c005e67
update readme for release instructions
jch Sep 18, 2015
1ac5805
readme extensions section
jch Sep 18, 2015
406ca3a
Merge pull request #220 from ruby-ldap/add-readme-extensions-section
jch Sep 18, 2015
98d122d
follow semver
jch Sep 19, 2015
777438d
missed a spot
jch Sep 19, 2015
d27c084
Merge pull request #219 from ruby-ldap/release-v0.12
jch Sep 21, 2015
f950eca
Specify the port of LDAP server by giving INTEGRATION_PORT environmen…
satoryu Sep 21, 2015
fd8aff7
Merge pull request #221 from satoryu/support_integration_port_env
jch Sep 21, 2015
cede61d
Add the ability to provide a list of hosts to use when opening a conn…
Sep 28, 2015
c0db1d1
Remove enumerable enforcement attempt in tests
Sep 28, 2015
5673f83
Merge pull request #223 from javanthropus/support_host_list
jch Sep 29, 2015
07b48d3
add slash to attyirbute value filter
rlanore Sep 29, 2015
4157684
Merge pull request #225 from rlanore/master
jch Sep 29, 2015
197d460
Extract Simple method as AuthAdapter
satoryu Oct 2, 2015
b57a283
Fix uninitialized constant error by adding require statement
satoryu Oct 2, 2015
9c7b1af
Fix typo
satoryu Oct 2, 2015
2546e35
Instantiate AuthAdapter in #bind
satoryu Oct 2, 2015
069ad98
Fix wrong reference to constant
satoryu Oct 2, 2015
585ae82
Call connection#write method with send
satoryu Oct 2, 2015
ac729dd
Net::LDAP::Connection#bind is abolihsed
satoryu Oct 2, 2015
d5f7516
DRY up connection handling logic
Sep 28, 2015
91db1ba
Define Sasl AuthAdapter
satoryu Oct 3, 2015
ab20ad2
Define GSS_SPNEGO AuthAdapter
satoryu Oct 3, 2015
60edf55
Make namespace of AuthAdapater singular
satoryu Oct 7, 2015
b56450d
Fix wrong adapter used in GSS_SPNEGO
satoryu Oct 7, 2015
86e4ba1
Move registration of AuthAdapters to net/ldap
satoryu Oct 7, 2015
fbb1951
Register gss_spnego when requiring 'net/ldap'
satoryu Oct 8, 2015
9bf1f30
Raise exception when specifying undefined auth method
satoryu Oct 8, 2015
8be5224
GSS SPNEGO is not supported
satoryu Oct 9, 2015
4667a08
Merge pull request #226 from satoryu/define_auth_adapters
jch Oct 13, 2015
edee2ee
Move connection error handling logic into a new error class
Oct 18, 2015
e1a0d13
Resolve rubocop violations
Oct 18, 2015
5a4ddb1
Assign exceptions to a variable rather than use $!
Oct 19, 2015
ab320af
Close the socket where opened when necessary
Oct 19, 2015
e829069
Move connection cleanup logic into the close method
Oct 26, 2015
4b22ea7
Merge pull request #224 from javanthropus/dry_up_connection_handling
jch Oct 27, 2015
762b78f
release 0.12.0
jch Oct 27, 2015
878ded8
Merge pull request #229 from ruby-ldap/release-0.12.0-again
jch Oct 27, 2015
2f053dd
Release 0.12.0
jch Oct 27, 2015
b637db7
Set operation result if LDAP server is not accessible
Nov 5, 2015
c89d493
Merge pull request #232 from dg-ratiodata/feature/set_operation_resul…
jch Nov 6, 2015
83406ee
Fixed capitalization of StartTLSError
justinoue Nov 9, 2015
d5e6afd
lazy init Net::LDAP::Connection's internal sock
jch Nov 10, 2015
4a415bc
preserve existing socket init code
jch Nov 10, 2015
b856806
#socket internal for easier testing
jch Nov 10, 2015
76dde7b
parameterize socket_class for testing
jch Nov 10, 2015
53cc6b5
remove tcpsocket stubbing
jch Nov 10, 2015
e9a1bf1
add initialize docs
jch Nov 10, 2015
9a2e26e
preserve existing behavior
jch Nov 10, 2015
259f18a
update tests
jch Nov 10, 2015
f6ad189
use fake for auth adapter test
jch Nov 11, 2015
e7cc5ae
replace ldap tests with fake connection object
jch Nov 11, 2015
7969aa9
some cleanup
jch Nov 11, 2015
8ac0436
Merge pull request #236 from ruby-ldap/formatting-cleanup
jch Nov 11, 2015
5937824
release 0.12.1
jch Nov 11, 2015
26f7a7e
Merge pull request #237 from ruby-ldap/release-0.12.1
jch Nov 11, 2015
9f29e15
Release 0.12.1
jch Nov 11, 2015
d65c597
Merge pull request #234 from justinoue/master
jch Nov 17, 2015
11ad905
Net::LDAP#encryption accepts string
satoryu Nov 25, 2015
6a2f702
Giving Hash, it is used as encryption options.
satoryu Nov 25, 2015
0062027
Drop support for ruby 1.9.3
satoryu Dec 1, 2015
50d44a0
Merge pull request #240 from satoryu/drop_support_for_1.9
jch Dec 1, 2015
1fb654a
Merge branch 'master' into ldap_encryption_accepts_string
satoryu Dec 2, 2015
737c484
Remove 2.3.0-preview since ruby-head already is included
satoryu Dec 2, 2015
397ac68
Merge pull request #241 from satoryu/fix_travis_yml
jch Dec 2, 2015
def2c46
Deprecate encrypt method
satoryu Dec 13, 2015
9f9abd3
When calling Net::LDAP#encryption, it shows deprecation warning.
satoryu Dec 13, 2015
ecce488
. adds correct UTF-8 encoding
Dec 14, 2015
ea21ef9
Merge pull request #242 from andibachmann/master
jch Dec 15, 2015
7907453
Merge pull request #239 from satoryu/ldap_encryption_accepts_string
jch Jan 4, 2016
34ea953
Update bundler before installing gems with bundler
satoryu Jan 5, 2016
4671db5
Merge pull request #245 from satoryu/fix_travis_bundler_issue
jch Jan 5, 2016
b05d766
Remove trailing spaces
astratto Dec 17, 2015
f6611e2
Use Socket.tcp instead of TCPSocket.new to provide socket timeouts
astratto Dec 17, 2015
7b692fc
Merge pull request #243 from astratto/connect_timeout
jch Jan 5, 2016
e63134e
Support for rfc3062 Password Modify, closes #163
Dec 15, 2014
aa0638c
release 0.13.0
jch Jan 6, 2016
2c19a06
Merge pull request #248 from ruby-ldap/release-0.13.0
jch Jan 7, 2016
67d8311
Release 0.13.0
jch Jan 7, 2016
987c522
Merge pull request #178 from mynameisrufus/feature/rfc3062
jch Jan 8, 2016
d35d3bf
Merge remote-tracking branch 'origin/master' into lazy-socket-initial…
jch Jan 8, 2016
1aab8c9
set socket_class in initialize
jch Jan 8, 2016
0dec1d9
fix multiline blocks
jch Jan 8, 2016
63d7bbb
fix trailing underscore
jch Jan 8, 2016
17e2fe6
fix multiline block
jch Jan 8, 2016
2702b89
fix multiline blocks
jch Jan 8, 2016
defcc86
add explicit exceptions for this project
jch Jan 8, 2016
5a06857
regenerate rubocop_todo
jch Jan 8, 2016
b32f4e7
Merge pull request #235 from ruby-ldap/lazy-socket-initialization
jch Jan 11, 2016
0573342
Merge pull request #249 from ruby-ldap/rubocop-fixes
jch Jan 12, 2016
64d9f28
fix deprecated hash methods
mynameisrufus Jan 11, 2016
8572cac
fix space after comma
mynameisrufus Jan 11, 2016
0e68084
fix space inside brackets
mynameisrufus Jan 11, 2016
6e5348f
Merge pull request #252 from mynameisrufus/rubocop-fix/space-inside-b…
jch Jan 12, 2016
8a50e85
Merge pull request #253 from mynameisrufus/rubocop-fix/space-after-comma
jch Jan 12, 2016
15049c5
Merge pull request #254 from mynameisrufus/rubocop-fix/deprecated-has…
jch Jan 12, 2016
9d62403
fix trailing comma
jch Jan 12, 2016
f1659c5
Merge pull request #256 from mynameisrufus/rubocop-fix/trailing-comma
jch Jan 13, 2016
bf9c251
fix symbol proc
jch Jan 13, 2016
cfd990e
Merge pull request #255 from mynameisrufus/rubocop-fix/symbol-proc
jch Jan 13, 2016
27813f5
Docs: Net::LDAP now requires ruby >= 2
jesjos Jan 23, 2016
771e11c
Merge pull request #261 from jesjos/patch-1
jch Jan 26, 2016
8aaa96b
Normalize the encryption parameter passed to the LDAP constructor
Jan 27, 2016
5f7d795
Merge pull request #264 from ryanshow/master
jch Feb 3, 2016
60faa64
release 0.14.0
jch Feb 3, 2016
49ef274
Merge pull request #265 from ruby-ldap/release-0.14.0
jch Feb 5, 2016
3bf849d
Release 0.14.0
jch Feb 5, 2016
09d0c36
use connect_timeout when establishing an openssl connection
tmm1 Jun 15, 2016
b5b6d5a
fix test mock
tmm1 Jun 16, 2016
8ba4796
use non-blocking connect only when timeout is set
tmm1 Jun 16, 2016
21ffe8f
use Net::LDAP::SocketError on openssl timeouts
tmm1 Jun 16, 2016
749c22b
use ETIMEDOUT for openssl timeouts
tmm1 Jun 17, 2016
dd9409b
Merge pull request #273 from tmm1/ssl-connect-timeout
jch Jul 13, 2016
daae984
release 0.15.0
jch Jul 13, 2016
4f81ede
Merge pull request #276 from ruby-ldap/release-0.15.0
jch Jul 13, 2016
4ea3982
Fix misplaced constant
syskill Aug 4, 2016
d5fba08
update to rubocop 0.42.0
Aug 17, 2016
6815488
rename stale cop
Aug 17, 2016
c3642b6
re-generate .rubocop_todo.yaml from latest rubocop gem
Aug 17, 2016
b66eb1e
rubocop: fix Style/SymbolProc
Aug 17, 2016
d2d8536
rubocop: fix TrailingCommaInArguments, which is new
Aug 17, 2016
8b8ae9b
rubocop: fix Style/GuardClause
Aug 17, 2016
6564aab
Fix the bug #278
satoryu Aug 19, 2016
6cff7fa
Merge pull request #1 from satoryu/tmaher_rubocop_updates
tmaher Aug 19, 2016
680d024
Merge pull request #278 from tmaher/rubocop_updates
jch Aug 19, 2016
84ab4c2
fix iptables blackholing for macOS
Aug 23, 2016
7b2bb02
new fixture CA, now with private key
Aug 23, 2016
2137361
vagrant fix for macOS v Linux?
Aug 23, 2016
38b6147
helper should use the new CA
Aug 23, 2016
b42e931
rubocop fix
Aug 23, 2016
22eaf7c
cherry pick from https://github.com/ruby-ldap/ruby-net-ldap/pull/259
JPvRiel-SB Jan 14, 2016
d7b36d1
check that the encryption hash is defined before using it
Aug 23, 2016
748f1b9
add tests for cert/hostname mismatch
Aug 23, 2016
9bab5a5
stupid portforwarding tricks for local testing
Aug 23, 2016
381fdf4
omit example
Aug 23, 2016
fd1c823
doc tweak
Aug 23, 2016
7593af1
too many markdown syntaxes
Aug 23, 2016
052f90d
remove stale reference to gem
Aug 23, 2016
ca4e390
extra ldap object for multiple host tests
Aug 23, 2016
c6a465f
add multi-host SSL checks
Aug 23, 2016
1300bc0
include "localhost" as valid cert name
Aug 23, 2016
440ce7f
tidy up the TLS tests
Aug 23, 2016
199f429
fix up to look like https://github.com/ruby-ldap/ruby-net-ldap/pull/2…
Aug 23, 2016
caf1911
remove useless test CA
Aug 23, 2016
c801132
only use tcp/9389 with vagrant, use the right exception for bad TLS c…
Aug 23, 2016
80bab6c
handle both exceptions
Aug 23, 2016
eeb7a6d
single vs multiple hosts throw different exceptions
Aug 23, 2016
c5f2126
more TLS tests around merging vs not merging the default options
Aug 23, 2016
d2ba5e6
fix bogus multi-host check
Aug 23, 2016
41881aa
remove vagrant port override, because $INTEGRATION_PORT
Aug 23, 2016
19f9c7d
more no-merge-default-opts tests, done properly
Aug 23, 2016
3c18b1e
more docs about vagrant setup
Aug 23, 2016
0f51b56
add script to generate fixture
Aug 23, 2016
02a29ea
use script-generated fixture CA
Aug 23, 2016
7de6335
describe where fixture CA comes from; also indent
Aug 23, 2016
a890f03
linter quoting complaint
Aug 23, 2016
3aebc3d
test that no tls_options means we get the system CA bundle
Aug 24, 2016
4e5a8e7
improve system store tests
Aug 24, 2016
0a8c099
use default tls opts for validation
Aug 24, 2016
8ed4dca
properly add the fixture CA to CI system store
Aug 24, 2016
efd354a
names matter
Aug 24, 2016
0926274
don't need the whole default hash for a verify?
Aug 24, 2016
72ba381
add docs on how to actually validate an LDAP server cert
Aug 24, 2016
435332d
whoops, DEFAULT_PARAMS is already a hash
Aug 24, 2016
e4c46a2
Merge pull request #279 from tmaher/tls-verify-hostnames
jch Aug 24, 2016
944ea47
Merge remote-tracking branch 'gh/master' into sasl-fix
Aug 26, 2016
5bcde6e
MaxSaslChallenges => MAX_SASL_CHALLENGES, because it's a constant and…
Aug 26, 2016
7a605f5
Send DN and newPassword with password_modify request
thriqon May 18, 2016
8031bf5
Merge pull request #281 from ruby-ldap/sasl-fix
jch Feb 8, 2017
50b6cbc
bump version
jch Feb 24, 2017
8466539
update history.rdoc
jch Feb 24, 2017
78e97ed
Merge pull request #284 from ruby-ldap/release-0.16.0
jch Feb 24, 2017
61890b5
Update filter.rb
patelanuj28 Mar 25, 2017
36815b5
Merge pull request #271 from thriqon/modify-password-without-old-pass…
mtodd Oct 31, 2017
eb6e48a
Bump version
mtodd Oct 31, 2017
075ae5f
Update changelog
mtodd Oct 31, 2017
3570f08
Merge pull request #296 from ruby-ldap/release-0.16.1
schaary Oct 31, 2017
258bf07
Release 0.16.1
mtodd Oct 31, 2017
d78dc1e
Merge pull request #285 from patelanuj28/patch-1
schaary Nov 14, 2017
07f64bd
bugfix result_code on connection lost
guilhermewop May 15, 2018
9daa954
Merge pull request #308 from guilhermewop/gw-bugfix-result-code
schaary Sep 26, 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
15 changes: 15 additions & 0 deletions .rubocop.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,18 @@ inherit_from: .rubocop_todo.yml
AllCops:
Exclude:
- 'pkg/**/*'

Style/ExtraSpacing:
Enabled: false

Lint/AssignmentInCondition:
Enabled: false

Style/ParallelAssignment:
Enabled: false

Style/TrailingCommaInLiteral:
EnforcedStyleForMultiline: comma

Style/TrailingCommaInArguments:
EnforcedStyleForMultiline: comma
Loading