Metaunix/muldap
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Updated dependency versions (viper, cobra, and ldap)
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Details
ci/woodpecker/tag/woodpecker Pipeline was successful
Details

Browse Source
This commit is contained in:
Gregory Ballantine
2022-06-11 01:15:44 -04:00
parent b500c3262c
commit 092c9f3791
13 changed files with 508 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/group/add.go
View File

@ -9,7 +9,7 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/viper"
ldap "gopkg.in/ldap.v2"
ldap "github.com/go-ldap/ldap/v3"
util "git.metaunix.net/metaunix.net/muldap/lib/util"
)
@ -57,7 +57,7 @@ var groupAddCmd = &cobra.Command{
groupOClasses := viper.GetStringSlice("group.object_class")
// create a new add request object
addRequest := ldap.NewAddRequest(groupDn)
addRequest := ldap.NewAddRequest(groupDn, nil)
// add group attributes to the request
addRequest.Attribute(viper.GetString("group.id_attr"), []string{flagGroupName})
@ -103,7 +103,7 @@ var groupAddCmd = &cobra.Command{
if flagGroupMembers != "" && flagGroupType == "app" {
groupMembers := strings.Split(flagGroupMembers, ",")
for _, member := range groupMembers {
modify := ldap.NewModifyRequest(fmt.Sprintf("%s=%s,%s", viper.GetString("user.uid_attr"), member, viper.GetString("user.base_ou")))
modify := ldap.NewModifyRequest(fmt.Sprintf("%s=%s,%s", viper.GetString("user.uid_attr"), member, viper.GetString("user.base_ou")), nil)
modify.Replace(viper.GetString("user.uid_attr"), []string{member})
err = l.Modify(modify)
if err != nil {

6
cmd/group/addMember.go
View File

@ -8,7 +8,7 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/viper"
ldap "gopkg.in/ldap.v2"
ldap "github.com/go-ldap/ldap/v3"
util "git.metaunix.net/metaunix.net/muldap/lib/util"
)
@ -59,7 +59,7 @@ var groupAddMemberCmd = &cobra.Command{
// set up group attributes
groupDn := fmt.Sprintf("%s=%s,%s", viper.GetString("group.id_attr"), flagGroupName, viper.GetString("group.base_ou"))
// create new LDAP modify request
groupMod := ldap.NewModifyRequest(groupDn)
groupMod := ldap.NewModifyRequest(groupDn, nil)
// split list of group members
groupMembers := strings.Split(flagGroupMembers, ",")
@ -87,7 +87,7 @@ var groupAddMemberCmd = &cobra.Command{
if flagGroupMembers != "" && flagGroupType == "app" {
groupMembers := strings.Split(flagGroupMembers, ",")
for _, member := range groupMembers {
userMod := ldap.NewModifyRequest(fmt.Sprintf("%s=%s,%s", viper.GetString("user.uid_attr"), member, viper.GetString("user.base_ou")))
userMod := ldap.NewModifyRequest(fmt.Sprintf("%s=%s,%s", viper.GetString("user.uid_attr"), member, viper.GetString("user.base_ou")), nil)
userMod.Replace(viper.GetString("user.uid_attr"), []string{member})
err = l.Modify(userMod)
if err != nil {

2
cmd/group/delete.go
View File

@ -6,7 +6,7 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/viper"
ldap "gopkg.in/ldap.v2"
ldap "github.com/go-ldap/ldap/v3"
)
func init() {

6
cmd/group/deleteMember.go
View File

@ -8,7 +8,7 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/viper"
ldap "gopkg.in/ldap.v2"
ldap "github.com/go-ldap/ldap/v3"
util "git.metaunix.net/metaunix.net/muldap/lib/util"
)
@ -59,7 +59,7 @@ var groupDeleteMemberCmd = &cobra.Command{
// set up group attributes
groupDn := fmt.Sprintf("%s=%s,%s", viper.GetString("group.id_attr"), flagGroupName, viper.GetString("group.base_ou"))
// create new LDAP modify request
groupMod := ldap.NewModifyRequest(groupDn)
groupMod := ldap.NewModifyRequest(groupDn, nil)
// split list of group members
groupMembers := strings.Split(flagGroupMembers, ",")
@ -87,7 +87,7 @@ var groupDeleteMemberCmd = &cobra.Command{
if flagGroupMembers != "" && flagGroupType == "app" {
groupMembers := strings.Split(flagGroupMembers, ",")
for _, member := range groupMembers {
userMod := ldap.NewModifyRequest(fmt.Sprintf("%s=%s,%s", viper.GetString("user.uid_attr"), member, viper.GetString("user.base_ou")))
userMod := ldap.NewModifyRequest(fmt.Sprintf("%s=%s,%s", viper.GetString("user.uid_attr"), member, viper.GetString("user.base_ou")), nil)
userMod.Replace(viper.GetString("user.uid_attr"), []string{member})
err = l.Modify(userMod)
if err != nil {

4
cmd/ldif/add.go
View File

@ -8,7 +8,7 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/viper"
ldif "github.com/vetinari/ldif"
ldap "gopkg.in/ldap.v2"
ldap "github.com/go-ldap/ldap/v3"
)
func init() {
@ -61,7 +61,7 @@ var ldifAddCmd = &cobra.Command{
entryDn := entry.DN
// create a new LDAP add request
addRequest := ldap.NewAddRequest(entryDn)
addRequest := ldap.NewAddRequest(entryDn, nil)
// loop through and add the entry attributes
for _, entryAttr := range entry.Attributes {

2
cmd/ldif/delete.go
View File

@ -8,7 +8,7 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/viper"
ldif "github.com/vetinari/ldif"
ldap "gopkg.in/ldap.v2"
ldap "github.com/go-ldap/ldap/v3"
)
func init() {

2
cmd/search.go
View File

@ -7,7 +7,7 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/viper"
ldap "gopkg.in/ldap.v2"
ldap "github.com/go-ldap/ldap/v3"
)
var (

4
cmd/user/add.go
View File

@ -8,7 +8,7 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/viper"
ldap "gopkg.in/ldap.v2"
ldap "github.com/go-ldap/ldap/v3"
"git.metaunix.net/metaunix.net/muldap/lib/util"
)
@ -66,7 +66,7 @@ var userAddCmd = &cobra.Command{
userHome := fmt.Sprintf(viper.GetString("user.home_directory"), flagUserUsername)
// create a new add request object
addRequest := ldap.NewAddRequest(userDn)
addRequest := ldap.NewAddRequest(userDn, nil)
// add user attributes to the request
addRequest.Attribute(viper.GetString("user.uid_attr"), []string{flagUserUsername})
addRequest.Attribute("objectClass", viper.GetStringSlice("user.object_class"))

2
cmd/user/delete.go
View File

@ -6,7 +6,7 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/viper"
ldap "gopkg.in/ldap.v2"
ldap "github.com/go-ldap/ldap/v3"
)
func init() {

4
cmd/user/edit.go
View File

@ -8,7 +8,7 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/viper"
ldap "gopkg.in/ldap.v2"
ldap "github.com/go-ldap/ldap/v3"
)
var (
@ -54,7 +54,7 @@ var userEditCmd = &cobra.Command{
userDn := fmt.Sprintf("%s=%s,%s", viper.GetString("user.uid_attr"), flagUserUsername, viper.GetString("user.base_ou"))
// create a new edit request object
modifyRequest := ldap.NewModifyRequest(userDn)
modifyRequest := ldap.NewModifyRequest(userDn, nil)
// loop through list of attribute changes
for _, attrModify := range flagUserAttributes {
attr := strings.Split(attrModify, "=")

2
cmd/user/pw.go
View File

@ -6,7 +6,7 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/viper"
ldap "gopkg.in/ldap.v2"
ldap "github.com/go-ldap/ldap/v3"
cli "git.metaunix.net/metaunix.net/muldap/lib/cli"
)