Skip to content

Commit b1e88ff

Browse files
johnweldonjohnweldon
authored
Lint and dependency updates (#266)
- ber updates - lint fixes
1 parent fdc94b7 commit b1e88ff

16 files changed

+152
-157
lines changed

‎conn.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ func (dc *DialContext) dial(u *url.URL) (net.Conn, error) {
145145

146146
host, port, err := net.SplitHostPort(u.Host)
147147
if err != nil {
148-
// we asume that error is due to missing port
148+
// we assume that error is due to missing port
149149
host = u.Host
150150
port = ""
151151
}

‎conn_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"testing"
1313
"time"
1414

15-
"github.com/go-asn1-ber/asn1-ber"
15+
ber "github.com/go-asn1-ber/asn1-ber"
1616
)
1717

1818
func TestUnresponsiveConnection(t *testing.T) {

‎control.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"fmt"
55
"strconv"
66

7-
"github.com/go-asn1-ber/asn1-ber"
7+
ber "github.com/go-asn1-ber/asn1-ber"
88
)
99

1010
const (

‎dn_test.go

+38-38
Original file line numberDiff line numberDiff line change
@@ -7,44 +7,44 @@ import (
77

88
func TestSuccessfulDNParsing(t *testing.T) {
99
testcases := map[string]DN{
10-
"": DN{[]*RelativeDN{}},
11-
"cn=Jim\\2C \\22Hasse Hö\\22 Hansson!,dc=dummy,dc=com": DN{[]*RelativeDN{
12-
&RelativeDN{[]*AttributeTypeAndValue{&AttributeTypeAndValue{"cn", "Jim, \"Hasse Hö\" Hansson!"}}},
13-
&RelativeDN{[]*AttributeTypeAndValue{&AttributeTypeAndValue{"dc", "dummy"}}},
14-
&RelativeDN{[]*AttributeTypeAndValue{&AttributeTypeAndValue{"dc", "com"}}}}},
15-
"UID=jsmith,DC=example,DC=net": DN{[]*RelativeDN{
16-
&RelativeDN{[]*AttributeTypeAndValue{&AttributeTypeAndValue{"UID", "jsmith"}}},
17-
&RelativeDN{[]*AttributeTypeAndValue{&AttributeTypeAndValue{"DC", "example"}}},
18-
&RelativeDN{[]*AttributeTypeAndValue{&AttributeTypeAndValue{"DC", "net"}}}}},
19-
"OU=Sales+CN=J. Smith,DC=example,DC=net": DN{[]*RelativeDN{
20-
&RelativeDN{[]*AttributeTypeAndValue{
21-
&AttributeTypeAndValue{"OU", "Sales"},
22-
&AttributeTypeAndValue{"CN", "J. Smith"}}},
23-
&RelativeDN{[]*AttributeTypeAndValue{&AttributeTypeAndValue{"DC", "example"}}},
24-
&RelativeDN{[]*AttributeTypeAndValue{&AttributeTypeAndValue{"DC", "net"}}}}},
25-
"1.3.6.1.4.1.1466.0=#04024869": DN{[]*RelativeDN{
26-
&RelativeDN{[]*AttributeTypeAndValue{&AttributeTypeAndValue{"1.3.6.1.4.1.1466.0", "Hi"}}}}},
27-
"1.3.6.1.4.1.1466.0=#04024869,DC=net": DN{[]*RelativeDN{
28-
&RelativeDN{[]*AttributeTypeAndValue{&AttributeTypeAndValue{"1.3.6.1.4.1.1466.0", "Hi"}}},
29-
&RelativeDN{[]*AttributeTypeAndValue{&AttributeTypeAndValue{"DC", "net"}}}}},
30-
"CN=Lu\\C4\\8Di\\C4\\87": DN{[]*RelativeDN{
31-
&RelativeDN{[]*AttributeTypeAndValue{&AttributeTypeAndValue{"CN", "Lučić"}}}}},
32-
" CN = Lu\\C4\\8Di\\C4\\87 ": DN{[]*RelativeDN{
33-
&RelativeDN{[]*AttributeTypeAndValue{&AttributeTypeAndValue{"CN", "Lučić"}}}}},
34-
` A = 1 , B = 2 `: DN{[]*RelativeDN{
35-
&RelativeDN{[]*AttributeTypeAndValue{&AttributeTypeAndValue{"A", "1"}}},
36-
&RelativeDN{[]*AttributeTypeAndValue{&AttributeTypeAndValue{"B", "2"}}}}},
37-
` A = 1 + B = 2 `: DN{[]*RelativeDN{
38-
&RelativeDN{[]*AttributeTypeAndValue{
39-
&AttributeTypeAndValue{"A", "1"},
40-
&AttributeTypeAndValue{"B", "2"}}}}},
41-
` \ \ A\ \ = \ \ 1\ \ , \ \ B\ \ = \ \ 2\ \ `: DN{[]*RelativeDN{
42-
&RelativeDN{[]*AttributeTypeAndValue{&AttributeTypeAndValue{" A ", " 1 "}}},
43-
&RelativeDN{[]*AttributeTypeAndValue{&AttributeTypeAndValue{" B ", " 2 "}}}}},
44-
` \ \ A\ \ = \ \ 1\ \ + \ \ B\ \ = \ \ 2\ \ `: DN{[]*RelativeDN{
45-
&RelativeDN{[]*AttributeTypeAndValue{
46-
&AttributeTypeAndValue{" A ", " 1 "},
47-
&AttributeTypeAndValue{" B ", " 2 "}}}}},
10+
"": {[]*RelativeDN{}},
11+
"cn=Jim\\2C \\22Hasse Hö\\22 Hansson!,dc=dummy,dc=com": {[]*RelativeDN{
12+
{[]*AttributeTypeAndValue{{"cn", "Jim, \"Hasse Hö\" Hansson!"}}},
13+
{[]*AttributeTypeAndValue{{"dc", "dummy"}}},
14+
{[]*AttributeTypeAndValue{{"dc", "com"}}}}},
15+
"UID=jsmith,DC=example,DC=net": {[]*RelativeDN{
16+
{[]*AttributeTypeAndValue{{"UID", "jsmith"}}},
17+
{[]*AttributeTypeAndValue{{"DC", "example"}}},
18+
{[]*AttributeTypeAndValue{{"DC", "net"}}}}},
19+
"OU=Sales+CN=J. Smith,DC=example,DC=net": {[]*RelativeDN{
20+
{[]*AttributeTypeAndValue{
21+
{"OU", "Sales"},
22+
{"CN", "J. Smith"}}},
23+
{[]*AttributeTypeAndValue{{"DC", "example"}}},
24+
{[]*AttributeTypeAndValue{{"DC", "net"}}}}},
25+
"1.3.6.1.4.1.1466.0=#04024869": {[]*RelativeDN{
26+
{[]*AttributeTypeAndValue{{"1.3.6.1.4.1.1466.0", "Hi"}}}}},
27+
"1.3.6.1.4.1.1466.0=#04024869,DC=net": {[]*RelativeDN{
28+
{[]*AttributeTypeAndValue{{"1.3.6.1.4.1.1466.0", "Hi"}}},
29+
{[]*AttributeTypeAndValue{{"DC", "net"}}}}},
30+
"CN=Lu\\C4\\8Di\\C4\\87": {[]*RelativeDN{
31+
{[]*AttributeTypeAndValue{{"CN", "Lučić"}}}}},
32+
" CN = Lu\\C4\\8Di\\C4\\87 ": {[]*RelativeDN{
33+
{[]*AttributeTypeAndValue{{"CN", "Lučić"}}}}},
34+
` A = 1 , B = 2 `: {[]*RelativeDN{
35+
{[]*AttributeTypeAndValue{{"A", "1"}}},
36+
{[]*AttributeTypeAndValue{{"B", "2"}}}}},
37+
` A = 1 + B = 2 `: {[]*RelativeDN{
38+
{[]*AttributeTypeAndValue{
39+
{"A", "1"},
40+
{"B", "2"}}}}},
41+
` \ \ A\ \ = \ \ 1\ \ , \ \ B\ \ = \ \ 2\ \ `: {[]*RelativeDN{
42+
{[]*AttributeTypeAndValue{{" A ", " 1 "}}},
43+
{[]*AttributeTypeAndValue{{" B ", " 2 "}}}}},
44+
` \ \ A\ \ = \ \ 1\ \ + \ \ B\ \ = \ \ 2\ \ `: {[]*RelativeDN{
45+
{[]*AttributeTypeAndValue{
46+
{" A ", " 1 "},
47+
{" B ", " 2 "}}}}},
4848
}
4949

5050
for test, answer := range testcases {

‎error_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"testing"
88
"time"
99

10-
"github.com/go-asn1-ber/asn1-ber"
10+
ber "github.com/go-asn1-ber/asn1-ber"
1111
)
1212

1313
// TestNilPacket tests that nil packets don't cause a panic.

‎filter_test.go

+31-31
Original file line numberDiff line numberDiff line change
@@ -16,168 +16,168 @@ type compileTest struct {
1616
}
1717

1818
var testFilters = []compileTest{
19-
compileTest{
19+
{
2020
filterStr: "(&(sn=Miller)(givenName=Bob))",
2121
expectedFilter: "(&(sn=Miller)(givenName=Bob))",
2222
expectedType: FilterAnd,
2323
},
24-
compileTest{
24+
{
2525
filterStr: "(|(sn=Miller)(givenName=Bob))",
2626
expectedFilter: "(|(sn=Miller)(givenName=Bob))",
2727
expectedType: FilterOr,
2828
},
29-
compileTest{
29+
{
3030
filterStr: "(!(sn=Miller))",
3131
expectedFilter: "(!(sn=Miller))",
3232
expectedType: FilterNot,
3333
},
34-
compileTest{
34+
{
3535
filterStr: "(sn=Miller)",
3636
expectedFilter: "(sn=Miller)",
3737
expectedType: FilterEqualityMatch,
3838
},
39-
compileTest{
39+
{
4040
filterStr: "(sn=Mill*)",
4141
expectedFilter: "(sn=Mill*)",
4242
expectedType: FilterSubstrings,
4343
},
44-
compileTest{
44+
{
4545
filterStr: "(sn=*Mill)",
4646
expectedFilter: "(sn=*Mill)",
4747
expectedType: FilterSubstrings,
4848
},
49-
compileTest{
49+
{
5050
filterStr: "(sn=*Mill*)",
5151
expectedFilter: "(sn=*Mill*)",
5252
expectedType: FilterSubstrings,
5353
},
54-
compileTest{
54+
{
5555
filterStr: "(sn=*i*le*)",
5656
expectedFilter: "(sn=*i*le*)",
5757
expectedType: FilterSubstrings,
5858
},
59-
compileTest{
59+
{
6060
filterStr: "(sn=Mi*l*r)",
6161
expectedFilter: "(sn=Mi*l*r)",
6262
expectedType: FilterSubstrings,
6363
},
6464
// substring filters escape properly
65-
compileTest{
65+
{
6666
filterStr: `(sn=Mi*함*r)`,
6767
expectedFilter: `(sn=Mi*\ed\95\a8*r)`,
6868
expectedType: FilterSubstrings,
6969
},
7070
// already escaped substring filters don't get double-escaped
71-
compileTest{
71+
{
7272
filterStr: `(sn=Mi*\ed\95\a8*r)`,
7373
expectedFilter: `(sn=Mi*\ed\95\a8*r)`,
7474
expectedType: FilterSubstrings,
7575
},
76-
compileTest{
76+
{
7777
filterStr: "(sn=Mi*le*)",
7878
expectedFilter: "(sn=Mi*le*)",
7979
expectedType: FilterSubstrings,
8080
},
81-
compileTest{
81+
{
8282
filterStr: "(sn=*i*ler)",
8383
expectedFilter: "(sn=*i*ler)",
8484
expectedType: FilterSubstrings,
8585
},
86-
compileTest{
86+
{
8787
filterStr: "(sn>=Miller)",
8888
expectedFilter: "(sn>=Miller)",
8989
expectedType: FilterGreaterOrEqual,
9090
},
91-
compileTest{
91+
{
9292
filterStr: "(sn<=Miller)",
9393
expectedFilter: "(sn<=Miller)",
9494
expectedType: FilterLessOrEqual,
9595
},
96-
compileTest{
96+
{
9797
filterStr: "(sn=*)",
9898
expectedFilter: "(sn=*)",
9999
expectedType: FilterPresent,
100100
},
101-
compileTest{
101+
{
102102
filterStr: "(sn~=Miller)",
103103
expectedFilter: "(sn~=Miller)",
104104
expectedType: FilterApproxMatch,
105105
},
106-
compileTest{
106+
{
107107
filterStr: `(objectGUID='\fc\fe\a3\ab\f9\90N\aaGm\d5I~\d12)`,
108108
expectedFilter: `(objectGUID='\fc\fe\a3\ab\f9\90N\aaGm\d5I~\d12)`,
109109
expectedType: FilterEqualityMatch,
110110
},
111-
compileTest{
111+
{
112112
filterStr: `(objectGUID=абвгдеёжзийклмнопрстуфхцчшщъыьэюя)`,
113113
expectedFilter: `(objectGUID=\d0\b0\d0\b1\d0\b2\d0\b3\d0\b4\d0\b5\d1\91\d0\b6\d0\b7\d0\b8\d0\b9\d0\ba\d0\bb\d0\bc\d0\bd\d0\be\d0\bf\d1\80\d1\81\d1\82\d1\83\d1\84\d1\85\d1\86\d1\87\d1\88\d1\89\d1\8a\d1\8b\d1\8c\d1\8d\d1\8e\d1\8f)`,
114114
expectedType: FilterEqualityMatch,
115115
},
116-
compileTest{
116+
{
117117
filterStr: `(objectGUID=함수목록)`,
118118
expectedFilter: `(objectGUID=\ed\95\a8\ec\88\98\eb\aa\a9\eb\a1\9d)`,
119119
expectedType: FilterEqualityMatch,
120120
},
121-
compileTest{
121+
{
122122
filterStr: `(objectGUID=`,
123123
expectedFilter: ``,
124124
expectedType: 0,
125125
expectedErr: "unexpected end of filter",
126126
},
127-
compileTest{
127+
{
128128
filterStr: `(objectGUID=함수목록`,
129129
expectedFilter: ``,
130130
expectedType: 0,
131131
expectedErr: "unexpected end of filter",
132132
},
133-
compileTest{
133+
{
134134
filterStr: `((cn=)`,
135135
expectedFilter: ``,
136136
expectedType: 0,
137137
expectedErr: "unexpected end of filter",
138138
},
139-
compileTest{
139+
{
140140
filterStr: `(&(objectclass=inetorgperson)(cn=中文))`,
141141
expectedFilter: `(&(objectclass=inetorgperson)(cn=\e4\b8\ad\e6\96\87))`,
142142
expectedType: 0,
143143
},
144144
// attr extension
145-
compileTest{
145+
{
146146
filterStr: `(memberOf:=foo)`,
147147
expectedFilter: `(memberOf:=foo)`,
148148
expectedType: FilterExtensibleMatch,
149149
},
150150
// attr+named matching rule extension
151-
compileTest{
151+
{
152152
filterStr: `(memberOf:test:=foo)`,
153153
expectedFilter: `(memberOf:test:=foo)`,
154154
expectedType: FilterExtensibleMatch,
155155
},
156156
// attr+oid matching rule extension
157-
compileTest{
157+
{
158158
filterStr: `(cn:1.2.3.4.5:=Fred Flintstone)`,
159159
expectedFilter: `(cn:1.2.3.4.5:=Fred Flintstone)`,
160160
expectedType: FilterExtensibleMatch,
161161
},
162162
// attr+dn+oid matching rule extension
163-
compileTest{
163+
{
164164
filterStr: `(sn:dn:2.4.6.8.10:=Barney Rubble)`,
165165
expectedFilter: `(sn:dn:2.4.6.8.10:=Barney Rubble)`,
166166
expectedType: FilterExtensibleMatch,
167167
},
168168
// attr+dn extension
169-
compileTest{
169+
{
170170
filterStr: `(o:dn:=Ace Industry)`,
171171
expectedFilter: `(o:dn:=Ace Industry)`,
172172
expectedType: FilterExtensibleMatch,
173173
},
174174
// dn extension
175-
compileTest{
175+
{
176176
filterStr: `(:dn:2.4.6.8.10:=Dino)`,
177177
expectedFilter: `(:dn:2.4.6.8.10:=Dino)`,
178178
expectedType: FilterExtensibleMatch,
179179
},
180-
compileTest{
180+
{
181181
filterStr: `(memberOf:1.2.840.113556.1.4.1941:=CN=User1,OU=blah,DC=mydomain,DC=net)`,
182182
expectedFilter: `(memberOf:1.2.840.113556.1.4.1941:=CN=User1,OU=blah,DC=mydomain,DC=net)`,
183183
expectedType: FilterExtensibleMatch,

‎go.mod

+1-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,4 @@ module github.com/go-ldap/ldap
22

33
go 1.13
44

5-
require (
6-
github.com/go-asn1-ber/asn1-ber v1.3.1
7-
github.com/go-ldap/ldap v3.0.3+incompatible // indirect
8-
)
5+
require github.com/go-asn1-ber/asn1-ber v1.5.0

‎go.sum

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
1-
github.com/go-asn1-ber/asn1-ber v1.3.1 h1:gvPdv/Hr++TRFCl0UbPFHC54P9N9jgsRPnmnr419Uck=
2-
github.com/go-asn1-ber/asn1-ber v1.3.1/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0=
3-
github.com/go-ldap/ldap v3.0.3+incompatible h1:HTeSZO8hWMS1Rgb2Ziku6b8a7qRIZZMHjsvuZyatzwk=
4-
github.com/go-ldap/ldap v3.0.3+incompatible/go.mod h1:qfd9rJvER9Q0/D/Sqn1DfHRoBp40uXYvFoEVrNEPqRc=
1+
github.com/go-asn1-ber/asn1-ber v1.5.0 h1:/S4hO/AO6tLMlPX0oftGSOcdGJJN/MuYzfgWRMn199E=
2+
github.com/go-asn1-ber/asn1-ber v1.5.0/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0=

‎v3/conn.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ func (dc *DialContext) dial(u *url.URL) (net.Conn, error) {
145145

146146
host, port, err := net.SplitHostPort(u.Host)
147147
if err != nil {
148-
// we asume that error is due to missing port
148+
// we assume that error is due to missing port
149149
host = u.Host
150150
port = ""
151151
}

‎v3/conn_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"testing"
1313
"time"
1414

15-
"github.com/go-asn1-ber/asn1-ber"
15+
ber "github.com/go-asn1-ber/asn1-ber"
1616
)
1717

1818
func TestUnresponsiveConnection(t *testing.T) {

‎v3/control.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"fmt"
55
"strconv"
66

7-
"github.com/go-asn1-ber/asn1-ber"
7+
ber "github.com/go-asn1-ber/asn1-ber"
88
)
99

1010
const (

0 commit comments

Comments
 (0)