Skip to content

Commit

Permalink
implement server side sorting controls (rfc2891) (#414)
Browse files Browse the repository at this point in the history
* implement server side sorting controls (rfc2891)

* implement NewControlServerSideSorting to decode server side sorting request, add server side sorting type to ControlMap
  • Loading branch information
m-vinc authored Feb 26, 2023
1 parent a79fb6b commit b64a808
Show file tree
Hide file tree
Showing 2 changed files with 257 additions and 7 deletions.
211 changes: 204 additions & 7 deletions v3/control.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@ const (
// ControlTypeSubtreeDelete - https://datatracker.ietf.org/doc/html/draft-armijo-ldap-treedelete-02
ControlTypeSubtreeDelete = "1.2.840.113556.1.4.805"

// ControlTypeServerSideSorting - https://www.ietf.org/rfc/rfc2891.txt
ControlTypeServerSideSorting = "1.2.840.113556.1.4.473"
// ControlTypeServerSideSorting - https://www.ietf.org/rfc/rfc2891.txt
ControlTypeServerSideSortingResult = "1.2.840.113556.1.4.474"

// ControlTypeMicrosoftNotification - https://msdn.microsoft.com/en-us/library/aa366983(v=vs.85).aspx
ControlTypeMicrosoftNotification = "1.2.840.113556.1.4.528"
// ControlTypeMicrosoftShowDeleted - https://msdn.microsoft.com/en-us/library/aa366989(v=vs.85).aspx
Expand All @@ -33,13 +38,15 @@ const (

// ControlTypeMap maps controls to text descriptions
var ControlTypeMap = map[string]string{
ControlTypePaging: "Paging",
ControlTypeBeheraPasswordPolicy: "Password Policy - Behera Draft",
ControlTypeManageDsaIT: "Manage DSA IT",
ControlTypeSubtreeDelete: "Subtree Delete Control",
ControlTypeMicrosoftNotification: "Change Notification - Microsoft",
ControlTypeMicrosoftShowDeleted: "Show Deleted Objects - Microsoft",
ControlTypeMicrosoftServerLinkTTL: "Return TTL-DNs for link values with associated expiry times - Microsoft",
ControlTypePaging: "Paging",
ControlTypeBeheraPasswordPolicy: "Password Policy - Behera Draft",
ControlTypeManageDsaIT: "Manage DSA IT",
ControlTypeSubtreeDelete: "Subtree Delete Control",
ControlTypeMicrosoftNotification: "Change Notification - Microsoft",
ControlTypeMicrosoftShowDeleted: "Show Deleted Objects - Microsoft",
ControlTypeMicrosoftServerLinkTTL: "Return TTL-DNs for link values with associated expiry times - Microsoft",
ControlTypeServerSideSorting: "Server Side Sorting Request - LDAP Control Extension for Server Side Sorting of Search Results (RFC2891)",
ControlTypeServerSideSortingResult: "Server Side Sorting Results - LDAP Control Extension for Server Side Sorting of Search Results (RFC2891)",
}

// Control defines an interface controls provide to encode and describe themselves
Expand Down Expand Up @@ -490,6 +497,10 @@ func DecodeControl(packet *ber.Packet) (Control, error) {
return NewControlMicrosoftServerLinkTTL(), nil
case ControlTypeSubtreeDelete:
return NewControlSubtreeDelete(), nil
case ControlTypeServerSideSorting:
return NewControlServerSideSorting(value)
case ControlTypeServerSideSortingResult:
return NewControlServerSideSortingResult(value)
default:
c := new(ControlString)
c.ControlType = ControlType
Expand Down Expand Up @@ -560,3 +571,189 @@ func encodeControls(controls []Control) *ber.Packet {
}
return packet
}

// ControlServerSideSorting

type SortKey struct {
Reverse bool
AttributeType string
MatchingRule string
}

type ControlServerSideSorting struct {
SortKeys []*SortKey
}

func (c *ControlServerSideSorting) GetControlType() string {
return ControlTypeServerSideSorting
}

func NewControlServerSideSorting(value *ber.Packet) (*ControlServerSideSorting, error) {
sortKeys := []*SortKey{}

val := value.Children[1].Children

if len(val) != 1 {
return nil, fmt.Errorf("no sequence value in packet")
}

sequences := val[0].Children

for i, sequence := range sequences {
sortKey := &SortKey{}

if len(sequence.Children) < 2 {
return nil, fmt.Errorf("attributeType or matchingRule is missing from sequence %d", i)
}

sortKey.AttributeType = sequence.Children[0].Value.(string)
sortKey.MatchingRule = sequence.Children[1].Value.(string)

if len(sequence.Children) == 3 {
sortKey.Reverse = sequence.Children[2].Value.(bool)
}

sortKeys = append(sortKeys, sortKey)
}

return &ControlServerSideSorting{SortKeys: sortKeys}, nil
}

func NewControlServerSideSortingWithSortKeys(sortKeys []*SortKey) *ControlServerSideSorting {
return &ControlServerSideSorting{SortKeys: sortKeys}
}

func (c *ControlServerSideSorting) Encode() *ber.Packet {
packet := ber.Encode(ber.ClassUniversal, ber.TypeConstructed, ber.TagSequence, nil, "Control")
control := ber.NewString(ber.ClassUniversal, ber.TypePrimitive, ber.TagOctetString, c.GetControlType(), "Control Type")

value := ber.Encode(ber.ClassUniversal, ber.TypePrimitive, ber.TagOctetString, nil, "Control Value")
seqs := ber.Encode(ber.ClassUniversal, ber.TypeConstructed, ber.TagSequence, nil, "SortKeyList")

for _, f := range c.SortKeys {
seq := ber.Encode(ber.ClassUniversal, ber.TypeConstructed, ber.TagSequence, nil, "")

seq.AppendChild(
ber.NewString(ber.ClassUniversal, ber.TypePrimitive, ber.TagOctetString, f.AttributeType, "attributeType"),
)
seq.AppendChild(
ber.NewString(ber.ClassContext, ber.TypePrimitive, 0, f.MatchingRule, "orderingRule"),
)
if f.Reverse {
seq.AppendChild(
ber.NewBoolean(ber.ClassContext, ber.TypePrimitive, 1, f.Reverse, "reverseOrder"),
)
}

seqs.AppendChild(seq)
}

value.AppendChild(seqs)

packet.AppendChild(control)
packet.AppendChild(value)

return packet
}

func (c *ControlServerSideSorting) String() string {
return fmt.Sprintf(
"Control Type: %s (%q) Criticality:%t %+v",
"Server Side Sorting",
c.GetControlType(),
false,
c.SortKeys,
)
}

// ControlServerSideSortingResponse

const (
ControlServerSideSortingCodeSuccess ControlServerSideSortingCode = 0
ControlServerSideSortingCodeOperationsError ControlServerSideSortingCode = 1
ControlServerSideSortingCodeTimeLimitExceeded ControlServerSideSortingCode = 2
ControlServerSideSortingCodeStrongAuthRequired ControlServerSideSortingCode = 8
ControlServerSideSortingCodeAdminLimitExceeded ControlServerSideSortingCode = 11
ControlServerSideSortingCodeNoSuchAttribute ControlServerSideSortingCode = 16
ControlServerSideSortingCodeInappropriateMatching ControlServerSideSortingCode = 18
ControlServerSideSortingCodeInsufficientAccessRights ControlServerSideSortingCode = 50
ControlServerSideSortingCodeBusy ControlServerSideSortingCode = 51
ControlServerSideSortingCodeUnwillingToPerform ControlServerSideSortingCode = 53
ControlServerSideSortingCodeOther ControlServerSideSortingCode = 80
)

var ControlServerSideSortingCodes = []ControlServerSideSortingCode{
ControlServerSideSortingCodeSuccess,
ControlServerSideSortingCodeOperationsError,
ControlServerSideSortingCodeTimeLimitExceeded,
ControlServerSideSortingCodeStrongAuthRequired,
ControlServerSideSortingCodeAdminLimitExceeded,
ControlServerSideSortingCodeNoSuchAttribute,
ControlServerSideSortingCodeInappropriateMatching,
ControlServerSideSortingCodeInsufficientAccessRights,
ControlServerSideSortingCodeBusy,
ControlServerSideSortingCodeUnwillingToPerform,
ControlServerSideSortingCodeOther,
}

type ControlServerSideSortingCode int64

// Valid test the code contained in the control against the ControlServerSideSortingCodes slice and return an error if the code is unknown.
func (c ControlServerSideSortingCode) Valid() error {
for _, validRet := range ControlServerSideSortingCodes {
if c == validRet {
return nil
}
}
return fmt.Errorf("unknown return code : %d", c)
}

func NewControlServerSideSortingResult(pkt *ber.Packet) (*ControlServerSideSortingResult, error) {
control := &ControlServerSideSortingResult{}

if pkt == nil || len(pkt.Children) == 0 {
return nil, fmt.Errorf("bad packet")
}

codeInt, err := ber.ParseInt64(pkt.Children[0].Data.Bytes())
if err != nil {
return nil, err
}

code := ControlServerSideSortingCode(codeInt)
if err := code.Valid(); err != nil {
return nil, err
}

return control, nil
}

type ControlServerSideSortingResult struct {
Criticality bool

Result ControlServerSideSortingCode

// Not populated for now. I can't get openldap to send me this value, so I think this is specific to other directory server
// AttributeType string
}

func (control *ControlServerSideSortingResult) GetControlType() string {
return ControlTypeServerSideSortingResult
}
func (c *ControlServerSideSortingResult) Encode() *ber.Packet {
packet := ber.Encode(ber.ClassUniversal, ber.TypeConstructed, ber.TagSequence, nil, "SortResult sequence")
sortResult := ber.NewInteger(ber.ClassUniversal, ber.TypePrimitive, ber.TagEnumerated, int64(c.Result), "SortResult")
packet.AppendChild(sortResult)

return packet
}

func (c *ControlServerSideSortingResult) String() string {
return fmt.Sprintf(
"Control Type: %s (%q) Criticality:%t ResultCode:%+v",
"Server Side Sorting Result",
c.GetControlType(),
c.Criticality,
c.Result,
)
}
53 changes: 53 additions & 0 deletions v3/control_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -210,3 +210,56 @@ func TestDecodeControl(t *testing.T) {
})
}
}

func TestControlServerSideSortingDecoding(t *testing.T) {
control := NewControlServerSideSortingWithSortKeys([]*SortKey{{
MatchingRule: "foo",
AttributeType: "foobar",
Reverse: true,
}, {
MatchingRule: "foo",
AttributeType: "foobar",
Reverse: false,
}, {
MatchingRule: "",
AttributeType: "",
Reverse: false,
}, {
MatchingRule: "totoRule",
AttributeType: "",
Reverse: false,
}, {
MatchingRule: "",
AttributeType: "totoType",
Reverse: false,
}})

controlDecoded, err := NewControlServerSideSorting(control.Encode())
if err != nil {
t.Fatal(err)
}

if control.GetControlType() != controlDecoded.GetControlType() {
t.Fatalf("control type mismatch: control:%s - decoded:%s", control.GetControlType(), controlDecoded.GetControlType())
}

if len(control.SortKeys) != len(controlDecoded.SortKeys) {
t.Fatalf("sort keys length mismatch (control: %d - decoded: %d)", len(control.SortKeys), len(controlDecoded.SortKeys))
}

for i, sk := range control.SortKeys {
dsk := controlDecoded.SortKeys[i]

if sk.AttributeType != dsk.AttributeType {
t.Fatalf("attribute type mismatch for sortkey %d", i)
}

if sk.MatchingRule != dsk.MatchingRule {
t.Fatalf("matching rule mismatch for sortkey %d", i)
}

if sk.Reverse != dsk.Reverse {
t.Fatalf("reverse mismtach for sortkey %d", i)
}
}
}

0 comments on commit b64a808

Please sign in to comment.