summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lib/gitlab/ldap/dn.rb42
-rw-r--r--spec/lib/gitlab/ldap/dn_spec.rb32
2 files changed, 41 insertions, 33 deletions
diff --git a/lib/gitlab/ldap/dn.rb b/lib/gitlab/ldap/dn.rb
index 557b5af118e..05252c75624 100644
--- a/lib/gitlab/ldap/dn.rb
+++ b/lib/gitlab/ldap/dn.rb
@@ -37,16 +37,16 @@ module Gitlab
buffer = StringIO.new
args.each_index do |index|
- buffer << "=" if index % 2 == 1
- buffer << "," if index % 2 == 0 && index != 0
+ buffer << "=" if index.odd?
+ buffer << "," if index.even? && index != 0
arg = args[index].downcase
- if index < args.length - 1 || index % 2 == 1
- buffer << self.class.escape(arg)
- else
- buffer << arg
- end
+ buffer << if index < args.length - 1 || index.odd?
+ self.class.escape(arg)
+ else
+ arg
+ end
end
@dn = buffer.string
@@ -55,6 +55,9 @@ module Gitlab
##
# Parse a DN into key value pairs using ASN from
# http://tools.ietf.org/html/rfc2253 section 3.
+ # rubocop:disable Metrics/AbcSize
+ # rubocop:disable Metrics/CyclomaticComplexity
+ # rubocop:disable Metrics/PerceivedComplexity
def each_pair
state = :key
key = StringIO.new
@@ -98,7 +101,7 @@ module Gitlab
state = :key
yield key.string.strip, value.string.rstrip
key = StringIO.new
- value = StringIO.new;
+ value = StringIO.new
else
state = :value_normal
value << char
@@ -110,7 +113,7 @@ module Gitlab
state = :key
yield key.string.strip, value.string.rstrip
key = StringIO.new
- value = StringIO.new;
+ value = StringIO.new
when '+' then raise(UnsupportedDnFormatError, "Multivalued RDNs are not supported")
else value << char
end
@@ -119,8 +122,12 @@ module Gitlab
when '0'..'9', 'a'..'f' then
state = :value_normal_escape_hex
hex_buffer = char
- when /\s/ then state = :value_normal_escape_whitespace; value << char
- else state = :value_normal; value << char
+ when /\s/ then
+ state = :value_normal_escape_whitespace
+ value << char
+ else
+ state = :value_normal
+ value << char
end
when :value_normal_escape_hex then
case char
@@ -136,7 +143,7 @@ module Gitlab
state = :key
yield key.string.strip, value.string # Don't strip trailing escaped space!
key = StringIO.new
- value = StringIO.new;
+ value = StringIO.new
when '+' then raise(UnsupportedDnFormatError, "Multivalued RDNs are not supported")
else value << char
end
@@ -152,7 +159,7 @@ module Gitlab
state = :value_quoted_escape_hex
hex_buffer = char
else
- state = :value_quoted;
+ state = :value_quoted
value << char
end
when :value_quoted_escape_hex then
@@ -172,7 +179,7 @@ module Gitlab
state = :key
yield key.string.strip, value.string.rstrip
key = StringIO.new
- value = StringIO.new;
+ value = StringIO.new
else raise(MalformedDnError, "Expected the first character of a hex pair, but got \"#{char}\"")
end
when :value_hexstring_hex then
@@ -189,7 +196,7 @@ module Gitlab
state = :key
yield key.string.strip, value.string.rstrip
key = StringIO.new
- value = StringIO.new;
+ value = StringIO.new
else raise(MalformedDnError, "Expected the end of an attribute value, but got \"#{char}\"")
end
else raise "Fell out of state machine"
@@ -228,13 +235,13 @@ module Gitlab
# using a single backslash ('\') as escape. The space character is left
# out here because in a "normalized" string, spaces should only be escaped
# if necessary (i.e. leading or trailing space).
- NORMAL_ESCAPES = [',', '+', '"', '\\', '<', '>', ';', '=']
+ NORMAL_ESCAPES = [',', '+', '"', '\\', '<', '>', ';', '='].freeze
# The following must be represented as escaped hex
HEX_ESCAPES = {
"\n" => '\0a',
"\r" => '\0d'
- }
+ }.freeze
# Compiled character class regexp using the keys from the above hash, and
# checking for a space or # at the start, or space at the end, of the
@@ -257,6 +264,7 @@ module Gitlab
##
# Proxy all other requests to the string object, because a DN is mainly
# used within the library as a string
+ # rubocop:disable GitlabSecurity/PublicSend
def method_missing(method, *args, &block)
@dn.send(method, *args, &block)
end
diff --git a/spec/lib/gitlab/ldap/dn_spec.rb b/spec/lib/gitlab/ldap/dn_spec.rb
index a8687ec95d4..f923c67d922 100644
--- a/spec/lib/gitlab/ldap/dn_spec.rb
+++ b/spec/lib/gitlab/ldap/dn_spec.rb
@@ -48,7 +48,7 @@ describe Gitlab::LDAP::DN do
let(:given) { 'uid=john smith+telephonenumber=+1 555-555-5555,ou=people,dc=example,dc=com' }
it 'raises UnsupportedDnFormatError' do
- expect{ subject }.to raise_error(Gitlab::LDAP::UnsupportedDnFormatError)
+ expect { subject }.to raise_error(Gitlab::LDAP::UnsupportedDnFormatError)
end
end
@@ -57,7 +57,7 @@ describe Gitlab::LDAP::DN do
let(:given) { 'uid = John Smith + telephoneNumber = + 1 555-555-5555 , ou = People,dc=example,dc=com' }
it 'raises UnsupportedDnFormatError' do
- expect{ subject }.to raise_error(Gitlab::LDAP::UnsupportedDnFormatError)
+ expect { subject }.to raise_error(Gitlab::LDAP::UnsupportedDnFormatError)
end
end
@@ -65,7 +65,7 @@ describe Gitlab::LDAP::DN do
let(:given) { 'uid = John Smith + telephoneNumber = +1 555-555-5555 , ou = People,dc=example,dc=com' }
it 'raises UnsupportedDnFormatError' do
- expect{ subject }.to raise_error(Gitlab::LDAP::UnsupportedDnFormatError)
+ expect { subject }.to raise_error(Gitlab::LDAP::UnsupportedDnFormatError)
end
end
end
@@ -77,7 +77,7 @@ describe Gitlab::LDAP::DN do
let(:given) { 'uid=John Smith,' }
it 'raises MalformedDnError' do
- expect{ subject }.to raise_error(Gitlab::LDAP::MalformedDnError, 'DN string ended unexpectedly')
+ expect { subject }.to raise_error(Gitlab::LDAP::MalformedDnError, 'DN string ended unexpectedly')
end
end
@@ -85,7 +85,7 @@ describe Gitlab::LDAP::DN do
let(:given) { '0.9.2342.19200300.100.1.25=#aa aa' }
it 'raises MalformedDnError' do
- expect{ subject }.to raise_error(Gitlab::LDAP::MalformedDnError, "Expected the end of an attribute value, but got \"a\"")
+ expect { subject }.to raise_error(Gitlab::LDAP::MalformedDnError, "Expected the end of an attribute value, but got \"a\"")
end
end
@@ -93,7 +93,7 @@ describe Gitlab::LDAP::DN do
let(:given) { '0.9.2342.19200300.100.1.25=#aaXaaa' }
it 'raises MalformedDnError' do
- expect{ subject }.to raise_error(Gitlab::LDAP::MalformedDnError, "Expected the first character of a hex pair, but got \"x\"")
+ expect { subject }.to raise_error(Gitlab::LDAP::MalformedDnError, "Expected the first character of a hex pair, but got \"x\"")
end
end
@@ -101,7 +101,7 @@ describe Gitlab::LDAP::DN do
let(:given) { '0.9.2342.19200300.100.1.25=#aaaYaa' }
it 'raises MalformedDnError' do
- expect{ subject }.to raise_error(Gitlab::LDAP::MalformedDnError, "Expected the second character of a hex pair, but got \"y\"")
+ expect { subject }.to raise_error(Gitlab::LDAP::MalformedDnError, "Expected the second character of a hex pair, but got \"y\"")
end
end
@@ -109,7 +109,7 @@ describe Gitlab::LDAP::DN do
let(:given) { 'uid="Sebasti\\cX\\a1n"' }
it 'raises MalformedDnError' do
- expect{ subject }.to raise_error(Gitlab::LDAP::MalformedDnError, "Expected the second character of a hex pair inside a double quoted value, but got \"x\"")
+ expect { subject }.to raise_error(Gitlab::LDAP::MalformedDnError, "Expected the second character of a hex pair inside a double quoted value, but got \"x\"")
end
end
@@ -117,7 +117,7 @@ describe Gitlab::LDAP::DN do
let(:given) { 'John' }
it 'raises MalformedDnError' do
- expect{ subject }.to raise_error(Gitlab::LDAP::MalformedDnError, 'DN string ended unexpectedly')
+ expect { subject }.to raise_error(Gitlab::LDAP::MalformedDnError, 'DN string ended unexpectedly')
end
end
@@ -125,7 +125,7 @@ describe Gitlab::LDAP::DN do
let(:given) { 'cn="James' }
it 'raises MalformedDnError' do
- expect{ subject }.to raise_error(Gitlab::LDAP::MalformedDnError, 'DN string ended unexpectedly')
+ expect { subject }.to raise_error(Gitlab::LDAP::MalformedDnError, 'DN string ended unexpectedly')
end
end
@@ -133,7 +133,7 @@ describe Gitlab::LDAP::DN do
let(:given) { 'cn=J\ames' }
it 'raises MalformedDnError' do
- expect{ subject }.to raise_error(Gitlab::LDAP::MalformedDnError, 'Invalid escaped hex code "\am"')
+ expect { subject }.to raise_error(Gitlab::LDAP::MalformedDnError, 'Invalid escaped hex code "\am"')
end
end
@@ -141,7 +141,7 @@ describe Gitlab::LDAP::DN do
let(:given) { 'cn=\\' }
it 'raises MalformedDnError' do
- expect{ subject }.to raise_error(Gitlab::LDAP::MalformedDnError, 'DN string ended unexpectedly')
+ expect { subject }.to raise_error(Gitlab::LDAP::MalformedDnError, 'DN string ended unexpectedly')
end
end
@@ -149,7 +149,7 @@ describe Gitlab::LDAP::DN do
let(:given) { '1.2.d=Value' }
it 'raises MalformedDnError' do
- expect{ subject }.to raise_error(Gitlab::LDAP::MalformedDnError, 'Unrecognized RDN OID attribute type name character "d"')
+ expect { subject }.to raise_error(Gitlab::LDAP::MalformedDnError, 'Unrecognized RDN OID attribute type name character "d"')
end
end
@@ -157,7 +157,7 @@ describe Gitlab::LDAP::DN do
let(:given) { 'd1.2=Value' }
it 'raises MalformedDnError' do
- expect{ subject }.to raise_error(Gitlab::LDAP::MalformedDnError, 'Unrecognized RDN attribute type name character "."')
+ expect { subject }.to raise_error(Gitlab::LDAP::MalformedDnError, 'Unrecognized RDN attribute type name character "."')
end
end
@@ -165,7 +165,7 @@ describe Gitlab::LDAP::DN do
let(:given) { ' -uid=John Smith' }
it 'raises MalformedDnError' do
- expect{ subject }.to raise_error(Gitlab::LDAP::MalformedDnError, 'Unrecognized first character of an RDN attribute type name "-"')
+ expect { subject }.to raise_error(Gitlab::LDAP::MalformedDnError, 'Unrecognized first character of an RDN attribute type name "-"')
end
end
@@ -173,7 +173,7 @@ describe Gitlab::LDAP::DN do
let(:given) { 'uid\\=john' }
it 'raises MalformedDnError' do
- expect{ subject }.to raise_error(Gitlab::LDAP::MalformedDnError, 'Unrecognized RDN attribute type name character "\\"')
+ expect { subject }.to raise_error(Gitlab::LDAP::MalformedDnError, 'Unrecognized RDN attribute type name character "\\"')
end
end
end
View Lorry Controller Status