Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
ai3
accountserver
Commits
90d575cb
Commit
90d575cb
authored
May 05, 2019
by
ale
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move LDAP code to the backend/ldap subdirectory
parent
26bddda8
Changes
12
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
12 additions
and
12 deletions
+12
-12
backend/ldap/composite_values.go
backend/ldap/composite_values.go
+1
-1
backend/ldap/model.go
backend/ldap/model.go
+1
-1
backend/ldap/model_test.go
backend/ldap/model_test.go
+4
-4
backend/ldap/resources.go
backend/ldap/resources.go
+1
-1
backend/ldap/resources_test.go
backend/ldap/resources_test.go
+1
-1
backend/ldap/testdata/base.ldif
backend/ldap/testdata/base.ldif
+0
-0
backend/ldap/testdata/test1.ldif
backend/ldap/testdata/test1.ldif
+0
-0
backend/ldap/testdata/test2.ldif
backend/ldap/testdata/test2.ldif
+0
-0
backend/ldap/testdata/test3.ldif
backend/ldap/testdata/test3.ldif
+0
-0
backend/ldap/tx.go
backend/ldap/tx.go
+1
-1
backend/ldap/util.go
backend/ldap/util.go
+1
-1
cmd/accountserver/main.go
cmd/accountserver/main.go
+2
-2
No files found.
backend/composite_values.go
→
backend/
ldap/
composite_values.go
View file @
90d575cb
package
backend
package
ldap
backend
import
(
"encoding/base64"
...
...
backend/model.go
→
backend/
ldap/
model.go
View file @
90d575cb
package
backend
package
ldap
backend
import
(
"context"
...
...
backend/model_test.go
→
backend/
ldap/
model_test.go
View file @
90d575cb
package
backend
package
ldap
backend
import
(
"context"
...
...
@@ -36,7 +36,7 @@ func startServerAndGetUser3(t testing.TB) (func(), as.Backend, *as.RawUser) {
func
startServer
(
t
testing
.
TB
)
(
func
(),
as
.
Backend
)
{
stop
:=
ldaptest
.
StartServer
(
t
,
&
ldaptest
.
Config
{
Dir
:
"../ldaptest"
,
Dir
:
"../
../
ldaptest"
,
Port
:
testLDAPPort
,
Base
:
"dc=example,dc=com"
,
LDIFs
:
[]
string
{
...
...
@@ -182,7 +182,7 @@ func TestModel_SearchUser(t *testing.T) {
func
TestModel_SetResourceStatus
(
t
*
testing
.
T
)
{
stop
:=
ldaptest
.
StartServer
(
t
,
&
ldaptest
.
Config
{
Dir
:
"../ldaptest"
,
Dir
:
"../
../
ldaptest"
,
Port
:
testLDAPPort
,
Base
:
"dc=example,dc=com"
,
LDIFs
:
[]
string
{
"testdata/base.ldif"
,
"testdata/test1.ldif"
},
...
...
@@ -215,7 +215,7 @@ func TestModel_SetResourceStatus(t *testing.T) {
func
TestModel_HasAnyResource
(
t
*
testing
.
T
)
{
stop
:=
ldaptest
.
StartServer
(
t
,
&
ldaptest
.
Config
{
Dir
:
"../ldaptest"
,
Dir
:
"../
../
ldaptest"
,
Port
:
testLDAPPort
,
Base
:
"dc=example,dc=com"
,
LDIFs
:
[]
string
{
"testdata/base.ldif"
,
"testdata/test1.ldif"
},
...
...
backend/resources.go
→
backend/
ldap/
resources.go
View file @
90d575cb
package
backend
package
ldap
backend
import
(
"errors"
...
...
backend/resources_test.go
→
backend/
ldap/
resources_test.go
View file @
90d575cb
package
backend
package
ldap
backend
import
(
"testing"
...
...
backend/testdata/base.ldif
→
backend/
ldap/
testdata/base.ldif
View file @
90d575cb
File moved
backend/testdata/test1.ldif
→
backend/
ldap/
testdata/test1.ldif
View file @
90d575cb
File moved
backend/testdata/test2.ldif
→
backend/
ldap/
testdata/test2.ldif
View file @
90d575cb
File moved
backend/testdata/test3.ldif
→
backend/
ldap/
testdata/test3.ldif
View file @
90d575cb
File moved
backend/tx.go
→
backend/
ldap/
tx.go
View file @
90d575cb
package
backend
package
ldap
backend
import
(
"context"
...
...
backend/util.go
→
backend/
ldap/
util.go
View file @
90d575cb
package
backend
package
ldap
backend
import
(
"os"
...
...
cmd/accountserver/main.go
View file @
90d575cb
...
...
@@ -13,7 +13,7 @@ import (
"git.autistici.org/ai3/go-common/serverutil"
"gopkg.in/yaml.v2"
"git.autistici.org/ai3/accountserver/backend"
ldapbackend
"git.autistici.org/ai3/accountserver/backend
/ldap
"
"git.autistici.org/ai3/accountserver/server"
)
...
...
@@ -149,7 +149,7 @@ func main() {
log
.
Fatal
(
err
)
}
be
,
err
:=
backend
.
NewLDAPBackend
(
be
,
err
:=
ldap
backend
.
NewLDAPBackend
(
config
.
LDAP
.
URI
,
config
.
LDAP
.
BindDN
,
bindPw
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment