Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dex
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
hdacloud
dex
Commits
0f31566b
Commit
0f31566b
authored
8 years ago
by
Eric Chiang
Browse files
Options
Downloads
Patches
Plain Diff
connector: accept base64 encoded CA and add convience open method
parent
53852d4e
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
connector/ldap/ldap.go
+24
-4
24 additions, 4 deletions
connector/ldap/ldap.go
with
24 additions
and
4 deletions
connector/ldap/ldap.go
+
24
−
4
View file @
0f31566b
...
...
@@ -61,6 +61,9 @@ type Config struct {
// Path to a trusted root certificate file.
RootCA
string
`json:"rootCA"`
// Base64 encoded PEM data containing root CAs.
RootCAData
[]
byte
`json:"rootCAData"`
// BindDN and BindPW for an application service account. The connector uses these
// credentials to search for users and groups.
BindDN
string
`json:"bindDN"`
...
...
@@ -167,6 +170,20 @@ func escapeFilter(s string) string {
// Open returns an authentication strategy using LDAP.
func
(
c
*
Config
)
Open
()
(
connector
.
Connector
,
error
)
{
conn
,
err
:=
c
.
OpenConnector
()
if
err
!=
nil
{
return
nil
,
err
}
return
connector
.
Connector
(
conn
),
nil
}
// OpenConnector is the same as Open but returns a type with all implemented connector interfaces.
func
(
c
*
Config
)
OpenConnector
()
(
interface
{
connector
.
Connector
connector
.
PasswordConnector
connector
.
GroupsConnector
},
error
)
{
requiredFields
:=
[]
struct
{
name
string
val
string
...
...
@@ -196,10 +213,13 @@ func (c *Config) Open() (connector.Connector, error) {
}
tlsConfig
:=
new
(
tls
.
Config
)
if
c
.
RootCA
!=
""
{
data
,
err
:=
ioutil
.
ReadFile
(
c
.
RootCA
)
if
err
!=
nil
{
return
nil
,
fmt
.
Errorf
(
"ldap: read ca file: %v"
,
err
)
if
c
.
RootCA
!=
""
||
len
(
c
.
RootCAData
)
!=
0
{
data
:=
c
.
RootCAData
if
len
(
data
)
==
0
{
var
err
error
if
data
,
err
=
ioutil
.
ReadFile
(
c
.
RootCA
);
err
!=
nil
{
return
nil
,
fmt
.
Errorf
(
"ldap: read ca file: %v"
,
err
)
}
}
rootCAs
:=
x509
.
NewCertPool
()
if
!
rootCAs
.
AppendCertsFromPEM
(
data
)
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment