-
Notifications
You must be signed in to change notification settings - Fork 371
add basic ldif reader #49
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.
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
Closed
Closed
Changes from all commits
Commits
Show all changes
17 commits
Select commit
Hold shift + click to select a range
626a90b
add basic ldif reader
vetinari 5b2dc4d
Rework
vetinari 33174f5
moved
vetinari 47139c1
marshal ldif.LDIF{}s
vetinari 553040a
FoldWidth for marshalling
vetinari 9b058ac
export struct values
vetinari 039842e
add marshalling of change requests
vetinari b28402d
allow no line folding with FoldWidth < 0
vetinari f5b1f54
doc update
vetinari 80a4fdf
fixes, add EntriesAsLDIF()/ChangesAsLDIF()
vetinari 88b0c4c
tests for marshalling changes + fixes for those
vetinari 9aeb445
Merge branch 'master' of github.com:go-ldap/ldap into ldif-reader
vetinari f76f90f
clenup for golint / govet
vetinari bdac54f
update, add Parse(), Apply()
vetinari 94b60a2
fix error where multiple blank lines cause panic while parsing
vetinari 8232180
enforce optional "version: " only on first entry
vetinari 80c0aa1
Merge branch 'master' into ldif-reader
vetinari File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| package ldif | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "log" | ||
|
|
||
| "gopkg.in/ldap.v2" | ||
| ) | ||
|
|
||
| // Apply sends the LDIF entries to the server and does the changes as | ||
| // given by the entries. | ||
| // | ||
| // All *ldap.Entry are converted to an *ldap.AddRequest. | ||
| // | ||
| // By default, it returns on the first error. To continue with applying the | ||
| // LDIF, set the continueOnErr argument to true - in this case the errors | ||
| // are logged with log.Printf() | ||
| func (l *LDIF) Apply(conn ldap.Client, continueOnErr bool) error { | ||
| for _, entry := range l.Entries { | ||
| switch { | ||
| case entry.Entry != nil: | ||
| add := ldap.NewAddRequest(entry.Entry.DN) | ||
| for _, attr := range entry.Entry.Attributes { | ||
| add.Attribute(attr.Name, attr.Values) | ||
| } | ||
| entry.Add = add | ||
| fallthrough | ||
| case entry.Add != nil: | ||
| if err := conn.Add(entry.Add); err != nil { | ||
| if continueOnErr { | ||
| log.Printf("ERROR: Failed to add %s: %s", entry.Add.DN, err) | ||
| continue | ||
| } | ||
| return fmt.Errorf("failed to add %s: %s", entry.Add.DN, err) | ||
| } | ||
|
|
||
| case entry.Del != nil: | ||
| if err := conn.Del(entry.Del); err != nil { | ||
| if continueOnErr { | ||
| log.Printf("ERROR: Failed to delete %s: %s", entry.Del.DN, err) | ||
| continue | ||
| } | ||
| return fmt.Errorf("failed to delete %s: %s", entry.Del.DN, err) | ||
| } | ||
|
|
||
| case entry.Modify != nil: | ||
| if err := conn.Modify(entry.Modify); err != nil { | ||
| if continueOnErr { | ||
| log.Printf("ERROR: Failed to modify %s: %s", entry.Modify.DN, err) | ||
| continue | ||
| } | ||
| return fmt.Errorf("failed to modify %s: %s", entry.Modify.DN, err) | ||
| } | ||
| /* | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Let's not check in commented code either, unless there is some good reason. |
||
| case entry.ModifyDN != nil: | ||
| if err := conn.ModifyDN(entry.ModifyDN); err != nil { | ||
| if continueOnErr { | ||
| log.Printf("ERROR: Failed to modify dn %s: %s", entry.ModifyDN.DN, err) | ||
| continue | ||
| } | ||
| return fmt.Errorf("failed to modify dn %s: %s", entry.ModifyDN.DN, err) | ||
| } | ||
| */ | ||
| } | ||
| } | ||
| return nil | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe as a future TODO, can we use an io.Writer here, or maybe pass in the log rather than using the static global?