feat: implement having rootDN for dialURL

go-ldap · May 31, 2022 · cf793d4 · cf793d4
1 parent eb13da1
commit cf793d4
Show file tree

Hide file tree

Showing 16 changed files with 151 additions and 2 deletions.
diff --git a/add.go b/add.go
@@ -33,6 +33,14 @@ type AddRequest struct {
 	Controls []Control
 }
 
+func (req *AddRequest) appendBaseDN(dn string) appendDnRequest {
+	return &AddRequest{
+		DN:         appendDN(req.DN, dn),
+		Attributes: req.Attributes,
+		Controls:   req.Controls,
+	}
+}
+
 func (req *AddRequest) appendTo(envelope *ber.Packet) error {
 	pkt := ber.Encode(ber.ClassApplication, ber.TypeConstructed, ApplicationAddRequest, nil, "Add Request")
 	pkt.AppendChild(ber.NewString(ber.ClassUniversal, ber.TypePrimitive, ber.TagOctetString, req.DN, "DN"))

diff --git a/conn.go b/conn.go
@@ -104,6 +104,7 @@ type Conn struct {
 	wgClose             sync.WaitGroup
 	outstandingRequests uint
 	messageMutex        sync.Mutex
+	rootDN              string
 }
 
 var _ Client = &Conn{}
@@ -278,7 +279,12 @@ func DialURL(addr string, opts ...DialOpt) (*Conn, error) {
 		return nil, NewError(ErrorNetwork, err)
 	}
 
+	rootDN := ""
+	if u.Host == "" {
+		rootDN = u.Path[1:]
+	}
 	conn := NewConn(c, u.Scheme == "ldaps")
+	conn.rootDN = rootDN
 	conn.Start()
 	return conn, nil
 }

diff --git a/del.go b/del.go
@@ -12,6 +12,13 @@ type DelRequest struct {
 	Controls []Control
 }
 
+func (req *DelRequest) appendBaseDN(dn string) appendDnRequest {
+	return &DelRequest{
+		DN:       appendDN(req.DN, dn),
+		Controls: req.Controls,
+	}
+}
+
 func (req *DelRequest) appendTo(envelope *ber.Packet) error {
 	pkt := ber.Encode(ber.ClassApplication, ber.TypePrimitive, ApplicationDelRequest, req.DN, "Del Request")
 	pkt.Data.Write([]byte(req.DN))

diff --git a/dn.go b/dn.go
@@ -268,3 +268,15 @@ func (r *RelativeDN) hasAllAttributesFold(attrs []*AttributeTypeAndValue) bool {
 func (a *AttributeTypeAndValue) EqualFold(other *AttributeTypeAndValue) bool {
 	return strings.EqualFold(a.Type, other.Type) && strings.EqualFold(a.Value, other.Value)
 }
+
+func appendDN(baseDN, rootDN string) string {
+	if rootDN != "" {
+		var baseDnBuilder strings.Builder
+		if baseDN != "" {
+			baseDnBuilder.WriteByte(',')
+		}
+		baseDnBuilder.WriteString(rootDN)
+		return baseDnBuilder.String()
+	}
+	return baseDN
+}
diff --git a/moddn.go b/moddn.go
@@ -40,7 +40,7 @@ func NewModifyDNRequest(dn string, rdn string, delOld bool, newSup string) *Modi
 //
 // Refer NewModifyDNRequest for other parameters
 func NewModifyDNWithControlsRequest(dn string, rdn string, delOld bool,
-		newSup string, controls []Control) *ModifyDNRequest {
+	newSup string, controls []Control) *ModifyDNRequest {
 	return &ModifyDNRequest{
 		DN:           dn,
 		NewRDN:       rdn,
@@ -50,6 +50,16 @@ func NewModifyDNWithControlsRequest(dn string, rdn string, delOld bool,
 	}
 }
 
+func (req *ModifyDNRequest) appendBaseDN(dn string) appendDnRequest {
+	return &ModifyDNRequest{
+		DN:           appendDN(req.DN, dn),
+		NewRDN:       appendDN(req.NewRDN, dn),
+		DeleteOldRDN: req.DeleteOldRDN,
+		NewSuperior:  appendDN(req.NewSuperior, dn),
+		Controls:     req.Controls,
+	}
+}
+
 func (req *ModifyDNRequest) appendTo(envelope *ber.Packet) error {
 	pkt := ber.Encode(ber.ClassApplication, ber.TypeConstructed, ApplicationModifyDNRequest, nil, "Modify DN Request")
 	pkt.AppendChild(ber.NewString(ber.ClassUniversal, ber.TypePrimitive, ber.TagOctetString, req.DN, "DN"))

diff --git a/modify.go b/modify.go
@@ -82,6 +82,14 @@ func (req *ModifyRequest) appendChange(operation uint, attrType string, attrVals
 	req.Changes = append(req.Changes, Change{operation, PartialAttribute{Type: attrType, Vals: attrVals}})
 }
 
+func (req *ModifyRequest) appendBaseDN(dn string) appendDnRequest {
+	return &ModifyRequest{
+		DN:       appendDN(req.DN, dn),
+		Changes:  req.Changes,
+		Controls: req.Controls,
+	}
+}
+
 func (req *ModifyRequest) appendTo(envelope *ber.Packet) error {
 	pkt := ber.Encode(ber.ClassApplication, ber.TypeConstructed, ApplicationModifyRequest, nil, "Modify Request")
 	pkt.AppendChild(ber.NewString(ber.ClassUniversal, ber.TypePrimitive, ber.TagOctetString, req.DN, "DN"))

diff --git a/request.go b/request.go
@@ -16,6 +16,11 @@ type request interface {
 	appendTo(*ber.Packet) error
 }
 
+type appendDnRequest interface {
+	request
+	appendBaseDN(dn string) appendDnRequest
+}
+
 type requestFunc func(*ber.Packet) error
 
 func (f requestFunc) appendTo(p *ber.Packet) error {
@@ -29,6 +34,11 @@ func (l *Conn) doRequest(req request) (*messageContext, error) {
 
 	packet := ber.Encode(ber.ClassUniversal, ber.TypeConstructed, ber.TagSequence, nil, "LDAP Request")
 	packet.AppendChild(ber.NewInteger(ber.ClassUniversal, ber.TypePrimitive, ber.TagInteger, l.nextMessageID(), "MessageID"))
+
+	if areq, ok := req.(appendDnRequest); ok {
+		req = areq.appendBaseDN(l.rootDN)
+	}
+
 	if err := req.appendTo(packet); err != nil {
 		return nil, err
 	}

diff --git a/search.go b/search.go
@@ -231,6 +231,20 @@ type SearchRequest struct {
 	Controls     []Control
 }
 
+func (req *SearchRequest) appendBaseDN(dn string) appendDnRequest {
+	return &SearchRequest{
+		BaseDN:       appendDN(req.BaseDN, dn),
+		Scope:        req.Scope,
+		DerefAliases: req.DerefAliases,
+		SizeLimit:    req.SizeLimit,
+		TimeLimit:    req.TimeLimit,
+		TypesOnly:    req.TypesOnly,
+		Filter:       req.Filter,
+		Attributes:   req.Attributes,
+		Controls:     req.Controls,
+	}
+}
+
 func (req *SearchRequest) appendTo(envelope *ber.Packet) error {
 	pkt := ber.Encode(ber.ClassApplication, ber.TypeConstructed, ApplicationSearchRequest, nil, "Search Request")
 	pkt.AppendChild(ber.NewString(ber.ClassUniversal, ber.TypePrimitive, ber.TagOctetString, req.BaseDN, "Base DN"))

diff --git a/v3/add.go b/v3/add.go
@@ -33,6 +33,14 @@ type AddRequest struct {
 	Controls []Control
 }
 
+func (req *AddRequest) appendBaseDN(dn string) appendDnRequest {
+	return &AddRequest{
+		DN:         appendDN(req.DN, dn),
+		Attributes: req.Attributes,
+		Controls:   req.Controls,
+	}
+}
+
 func (req *AddRequest) appendTo(envelope *ber.Packet) error {
 	pkt := ber.Encode(ber.ClassApplication, ber.TypeConstructed, ApplicationAddRequest, nil, "Add Request")
 	pkt.AppendChild(ber.NewString(ber.ClassUniversal, ber.TypePrimitive, ber.TagOctetString, req.DN, "DN"))

diff --git a/v3/conn.go b/v3/conn.go
@@ -104,6 +104,7 @@ type Conn struct {
 	wgClose             sync.WaitGroup
 	outstandingRequests uint
 	messageMutex        sync.Mutex
+	rootDN              string
 }
 
 var _ Client = &Conn{}
@@ -278,7 +279,12 @@ func DialURL(addr string, opts ...DialOpt) (*Conn, error) {
 		return nil, NewError(ErrorNetwork, err)
 	}
 
+	rootDN := ""
+	if u.Host == "" {
+		rootDN = u.Path[1:]
+	}
 	conn := NewConn(c, u.Scheme == "ldaps")
+	conn.rootDN = rootDN
 	conn.Start()
 	return conn, nil
 }

diff --git a/v3/del.go b/v3/del.go
@@ -12,6 +12,13 @@ type DelRequest struct {
 	Controls []Control
 }
 
+func (req *DelRequest) appendBaseDN(dn string) appendDnRequest {
+	return &DelRequest{
+		DN:       appendDN(req.DN, dn),
+		Controls: req.Controls,
+	}
+}
+
 func (req *DelRequest) appendTo(envelope *ber.Packet) error {
 	pkt := ber.Encode(ber.ClassApplication, ber.TypePrimitive, ApplicationDelRequest, req.DN, "Del Request")
 	pkt.Data.Write([]byte(req.DN))

diff --git a/v3/dn.go b/v3/dn.go
@@ -268,3 +268,15 @@ func (r *RelativeDN) hasAllAttributesFold(attrs []*AttributeTypeAndValue) bool {
 func (a *AttributeTypeAndValue) EqualFold(other *AttributeTypeAndValue) bool {
 	return strings.EqualFold(a.Type, other.Type) && strings.EqualFold(a.Value, other.Value)
 }
+
+func appendDN(baseDN, rootDN string) string {
+	if rootDN != "" {
+		var baseDnBuilder strings.Builder
+		if baseDN != "" {
+			baseDnBuilder.WriteByte(',')
+		}
+		baseDnBuilder.WriteString(rootDN)
+		return baseDnBuilder.String()
+	}
+	return baseDN
+}
diff --git a/v3/moddn.go b/v3/moddn.go
@@ -40,7 +40,7 @@ func NewModifyDNRequest(dn string, rdn string, delOld bool, newSup string) *Modi
 //
 // Refer NewModifyDNRequest for other parameters
 func NewModifyDNWithControlsRequest(dn string, rdn string, delOld bool,
-		newSup string, controls []Control) *ModifyDNRequest {
+	newSup string, controls []Control) *ModifyDNRequest {
 	return &ModifyDNRequest{
 		DN:           dn,
 		NewRDN:       rdn,
@@ -50,6 +50,16 @@ func NewModifyDNWithControlsRequest(dn string, rdn string, delOld bool,
 	}
 }
 
+func (req *ModifyDNRequest) appendBaseDN(dn string) appendDnRequest {
+	return &ModifyDNRequest{
+		DN:           appendDN(req.DN, dn),
+		NewRDN:       appendDN(req.NewRDN, dn),
+		DeleteOldRDN: req.DeleteOldRDN,
+		NewSuperior:  appendDN(req.NewSuperior, dn),
+		Controls:     req.Controls,
+	}
+}
+
 func (req *ModifyDNRequest) appendTo(envelope *ber.Packet) error {
 	pkt := ber.Encode(ber.ClassApplication, ber.TypeConstructed, ApplicationModifyDNRequest, nil, "Modify DN Request")
 	pkt.AppendChild(ber.NewString(ber.ClassUniversal, ber.TypePrimitive, ber.TagOctetString, req.DN, "DN"))

diff --git a/v3/modify.go b/v3/modify.go
@@ -82,6 +82,14 @@ func (req *ModifyRequest) appendChange(operation uint, attrType string, attrVals
 	req.Changes = append(req.Changes, Change{operation, PartialAttribute{Type: attrType, Vals: attrVals}})
 }
 
+func (req *ModifyRequest) appendBaseDN(dn string) appendDnRequest {
+	return &ModifyRequest{
+		DN:       appendDN(req.DN, dn),
+		Changes:  req.Changes,
+		Controls: req.Controls,
+	}
+}
+
 func (req *ModifyRequest) appendTo(envelope *ber.Packet) error {
 	pkt := ber.Encode(ber.ClassApplication, ber.TypeConstructed, ApplicationModifyRequest, nil, "Modify Request")
 	pkt.AppendChild(ber.NewString(ber.ClassUniversal, ber.TypePrimitive, ber.TagOctetString, req.DN, "DN"))

diff --git a/v3/request.go b/v3/request.go
@@ -16,6 +16,11 @@ type request interface {
 	appendTo(*ber.Packet) error
 }
 
+type appendDnRequest interface {
+	request
+	appendBaseDN(dn string) appendDnRequest
+}
+
 type requestFunc func(*ber.Packet) error
 
 func (f requestFunc) appendTo(p *ber.Packet) error {
@@ -29,6 +34,10 @@ func (l *Conn) doRequest(req request) (*messageContext, error) {
 
 	packet := ber.Encode(ber.ClassUniversal, ber.TypeConstructed, ber.TagSequence, nil, "LDAP Request")
 	packet.AppendChild(ber.NewInteger(ber.ClassUniversal, ber.TypePrimitive, ber.TagInteger, l.nextMessageID(), "MessageID"))
+
+	if areq, ok := req.(appendDnRequest); ok {
+		req = areq.appendBaseDN(l.rootDN)
+	}
 	if err := req.appendTo(packet); err != nil {
 		return nil, err
 	}

diff --git a/v3/search.go b/v3/search.go
@@ -231,6 +231,20 @@ type SearchRequest struct {
 	Controls     []Control
 }
 
+func (req *SearchRequest) appendBaseDN(dn string) appendDnRequest {
+	return &SearchRequest{
+		BaseDN:       appendDN(req.BaseDN, dn),
+		Scope:        req.Scope,
+		DerefAliases: req.DerefAliases,
+		SizeLimit:    req.SizeLimit,
+		TimeLimit:    req.TimeLimit,
+		TypesOnly:    req.TypesOnly,
+		Filter:       req.Filter,
+		Attributes:   req.Attributes,
+		Controls:     req.Controls,
+	}
+}
+
 func (req *SearchRequest) appendTo(envelope *ber.Packet) error {
 	pkt := ber.Encode(ber.ClassApplication, ber.TypeConstructed, ApplicationSearchRequest, nil, "Search Request")
 	pkt.AppendChild(ber.NewString(ber.ClassUniversal, ber.TypePrimitive, ber.TagOctetString, req.BaseDN, "Base DN"))