go-ldap · Dec 16, 2024 · Dec 26, 2024 · Dec 26, 2024
diff --git a/.github/workflows/cifuzz.yml b/.github/workflows/cifuzz.yml
@@ -2,34 +2,35 @@ name: CIFuzz
 on: [pull_request]
 permissions: {}
 jobs:
- Fuzzing:
-   runs-on: ubuntu-latest
-   permissions:
-     security-events: write
-   steps:
-   - name: Build Fuzzers
-     id: build
-     uses: google/oss-fuzz/infra/cifuzz/actions/build_fuzzers@master
-     with:
-       oss-fuzz-project-name: 'go-ldap'
-       language: go
-   - name: Run Fuzzers
-     uses: google/oss-fuzz/infra/cifuzz/actions/run_fuzzers@master
-     with:
-       oss-fuzz-project-name: 'go-ldap'
-       language: go
-       fuzz-seconds: 300
-       output-sarif: true
-   - name: Upload Crash
-     uses: actions/upload-artifact@v3
-     if: failure() && steps.build.outcome == 'success'
-     with:
-       name: artifacts
-       path: ./out/artifacts
-   - name: Upload Sarif
-     if: always() && steps.build.outcome == 'success'
-     uses: github/codeql-action/upload-sarif@v2
-     with:
-      # Path to SARIF file relative to the root of the repository
-      sarif_file: cifuzz-sarif/results.sarif
-      checkout_path: cifuzz-sarif
+  Fuzzing:
+    if: false # Until go-fuzz project is updated to use v3 directory
+    runs-on: ubuntu-latest
+    permissions:
+      security-events: write
+    steps:
+      - name: Build Fuzzers
+        id: build
+        uses: google/oss-fuzz/infra/cifuzz/actions/build_fuzzers@master
+        with:
+          oss-fuzz-project-name: "go-ldap"
+          language: go
+      - name: Run Fuzzers
+        uses: google/oss-fuzz/infra/cifuzz/actions/run_fuzzers@master
+        with:
+          oss-fuzz-project-name: "go-ldap"
+          language: go
+          fuzz-seconds: 300
+          output-sarif: true
+      - name: Upload Crash
+        uses: actions/upload-artifact@v3
+        if: failure() && steps.build.outcome == 'success'
+        with:
+          name: artifacts
+          path: ./out/artifacts
+      - name: Upload Sarif
+        if: always() && steps.build.outcome == 'success'
+        uses: github/codeql-action/upload-sarif@v2
+        with:
+          # Path to SARIF file relative to the root of the repository
+          sarif_file: cifuzz-sarif/results.sarif
+          checkout_path: cifuzz-sarif
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -1,7 +1,7 @@
 name: golangci-lint
 on:
   pull_request:
-    branches: [ master ]
+    branches: [master]
 
 permissions:
   contents: read
@@ -13,11 +13,12 @@ jobs:
     steps:
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.23'
+          go-version: "1.23"
           cache: false
       - uses: actions/checkout@v4
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v6
         with:
           version: latest
           only-new-issues: true
+          working-directory: v3
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -2,54 +2,44 @@ name: PR
 
 on:
   pull_request:
-    branches: [ master ]
+    branches: [master]
 
 jobs:
-  build:
+  build-and-test:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go: [
-          '1.23',
-          '1.22',
-          '1.21',
-          '1.20',
-          '1.19',
-          '1.18',
-          '1.17',
-          '1.16',
-          '1.15',
-          '1.14',
-        ]
-        branch: [ '.', './v3' ]
-    name: Go ${{ matrix.go }}.x PR Validate ${{ matrix.branch }} (Modules)
+        go:
+          [
+            "1.23",
+            "1.22",
+            "1.21",
+            "1.20",
+            "1.19",
+            "1.18",
+            "1.17",
+            "1.16",
+            "1.15",
+            "1.14",
+          ]
+        directory: ["./v3"]
+    name: Go ${{ matrix.go }}.x PR Validate ${{ matrix.directory }} (Modules)
     steps:
-    - name: Checkout code
-      uses: actions/checkout@v4
+      - name: Checkout code
+        uses: actions/checkout@v4
 
-    - name: Set up Go
-      uses: actions/setup-go@v5
-      with:
-        go-version: ${{ matrix.go }}
-
-    - name: Version
-      run: go version
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: ${{ matrix.go }}
 
-    - name: Build and Validate
-      run: |
-        cd ${{ matrix.branch }}
-        go vet .
-        go test .
-        go test -cover -race -cpu 1,2,4 .
-        go build .
+      - name: Version
+        run: go version
 
-  lint:
-    name: Lint
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: golangci-lint
-        uses: golangci/golangci-lint-action@v6
-        with:
-          version: latest
-          only-new-issues: true
+      - name: Build, Validate, and Test
+        run: |
+          cd ${{ matrix.directory }}
+          go vet .
+          go test .
+          go test -cover -race -cpu 1,2,4 .
+          go build .
diff --git a/LICENSE b/LICENSE
@@ -1,7 +1,7 @@
 The MIT License (MIT)
 
 Copyright (c) 2011-2015 Michael Mitton (mmitton@gmail.com)
-Portions copyright (c) 2015-2016 go-ldap Authors
+Portions copyright (c) 2015-2024 go-ldap Authors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/README.md b/README.md
@@ -3,63 +3,50 @@
 # Basic LDAP v3 functionality for the GO programming language.
 
 The library implements the following specifications:
- - https://datatracker.ietf.org/doc/html/rfc4511 for basic operations
- - https://datatracker.ietf.org/doc/html/rfc3062 for password modify operation
- - https://datatracker.ietf.org/doc/html/rfc4514 for distinguished names parsing
- - https://datatracker.ietf.org/doc/html/rfc4533 for Content Synchronization Operation
- - https://datatracker.ietf.org/doc/html/draft-armijo-ldap-treedelete-02 for Tree Delete Control
- - https://datatracker.ietf.org/doc/html/rfc2891 for Server Side Sorting of Search Results
- - https://datatracker.ietf.org/doc/html/rfc4532 for WhoAmI requests
+
+- https://datatracker.ietf.org/doc/html/rfc4511 for basic operations
+- https://datatracker.ietf.org/doc/html/rfc3062 for password modify operation
+- https://datatracker.ietf.org/doc/html/rfc4514 for distinguished names parsing
+- https://datatracker.ietf.org/doc/html/rfc4533 for Content Synchronization Operation
+- https://datatracker.ietf.org/doc/html/draft-armijo-ldap-treedelete-02 for Tree Delete Control
+- https://datatracker.ietf.org/doc/html/rfc2891 for Server Side Sorting of Search Results
+- https://datatracker.ietf.org/doc/html/rfc4532 for WhoAmI requests
 
 ## Features:
 
- - Connecting to LDAP server (non-TLS, TLS, STARTTLS, through a custom dialer)
- - Binding to LDAP server (Simple Bind, GSSAPI, SASL)
- - "Who Am I" Requests / Responses
- - Searching for entries (normal and asynchronous)
- - Filter Compile / Decompile
- - Paging Search Results
- - Modify Requests / Responses
- - Add Requests / Responses
- - Delete Requests / Responses
- - Modify DN Requests / Responses
+- Connecting to LDAP server (non-TLS, TLS, STARTTLS, through a custom dialer)
+- Binding to LDAP server (Simple Bind, GSSAPI, SASL)
+- "Who Am I" Requests / Responses
+- Searching for entries (normal and asynchronous)
+- Filter Compile / Decompile
+- Paging Search Results
+- Modify Requests / Responses
+- Add Requests / Responses
+- Delete Requests / Responses
+- Modify DN Requests / Responses
 
 ## Go Modules:
 
 `go get github.com/go-ldap/ldap/v3`
 
-As go-ldap was v2+ when Go Modules came out, updating to Go Modules would be considered a breaking change.
-
-To maintain backwards compatability, we ultimately decided to use subfolders (as v3 was already a branch).
-Whilst this duplicates the code, we can move toward implementing a backwards-compatible versioning system that allows for code reuse.
-The alternative would be to increment the version number, however we believe that this would confuse users as v3 is in line with LDAPv3 (RFC-4511)
-https://tools.ietf.org/html/rfc4511
-
-
-For more info, please visit the pull request that updated to modules.
-https://github.com/go-ldap/ldap/pull/247
-
-To install with `GOMODULE111=off`, use `go get github.com/go-ldap/ldap`
-https://golang.org/cmd/go/#hdr-Legacy_GOPATH_go_get
-
-As always, we are looking for contributors with great ideas on how to best move forward.
-
-
 ## Contributing:
 
 Bug reports and pull requests are welcome!
 
 Before submitting a pull request, please make sure tests and verification scripts pass:
+
 ```
 make all
 ```
 
 To set up a pre-push hook to run the tests and verify scripts before pushing:
+
 ```
 ln -s ../../.githooks/pre-push .git/hooks/pre-push
 ```
 
 ---
+
 The Go gopher was designed by Renee French. (http://reneefrench.blogspot.com/)
 The design is licensed under the Creative Commons 3.0 Attributions license.
 Read this article for more details: http://blog.golang.org/gopher
diff --git a/add.go b/add.go
diff --git a/bind.go b/bind.go
diff --git a/client.go b/client.go
diff --git a/compare.go b/compare.go
diff --git a/conn.go b/conn.go
diff --git a/conn_test.go b/conn_test.go
diff --git a/control.go b/control.go
diff --git a/control_test.go b/control_test.go
diff --git a/debug.go b/debug.go
diff --git a/del.go b/del.go
diff --git a/dn.go b/dn.go
diff --git a/dn_test.go b/dn_test.go
diff --git a/doc.go b/doc.go
diff --git a/error.go b/error.go
diff --git a/error_test.go b/error_test.go
diff --git a/examples_moddn_test.go b/examples_moddn_test.go
diff --git a/examples_test.go b/examples_test.go
diff --git a/examples_windows_test.go b/examples_windows_test.go
diff --git a/extended.go b/extended.go
diff --git a/extended_test.go b/extended_test.go
diff --git a/filter.go b/filter.go
diff --git a/filter_test.go b/filter_test.go
diff --git a/fuzz_test.go b/fuzz_test.go
diff --git a/go.mod b/go.mod
diff --git a/go.sum b/go.sum
diff --git a/gssapi/client.go b/gssapi/client.go
diff --git a/gssapi/sspi.go b/gssapi/sspi.go
diff --git a/ldap.go b/ldap.go
diff --git a/ldap_test.go b/ldap_test.go
@@ -9,6 +9,5 @@ require (
 	github.com/google/uuid v1.6.0
 	github.com/jcmturner/gokrb5/v8 v8.4.4
 	github.com/stretchr/testify v1.8.1
-	golang.org/x/crypto v0.31.0 // indirect
-	golang.org/x/net v0.32.0 // indirect
+	golang.org/x/net v0.33.0 // indirect
 )
@@ -5,8 +5,6 @@ github.com/alexbrainman/sspi v0.0.0-20231016080023-1a75b4708caa/go.mod h1:cEWa1L
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/go-asn1-ber/asn1-ber v1.5.6 h1:CYsqysemXfEaQbyrLJmdsCRuufHoLa3P/gGWGl5TDrM=
-github.com/go-asn1-ber/asn1-ber v1.5.6/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0=
 github.com/go-asn1-ber/asn1-ber v1.5.7 h1:DTX+lbVTWaTw1hQ+PbZPlnDZPEIs0SS/GCZAl535dDk=
 github.com/go-asn1-ber/asn1-ber v1.5.7/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
@@ -47,10 +45,7 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y
 golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
 golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
 golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
-golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA=
-golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
 golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
-golang.org/x/crypto v0.30.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
 golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
 golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
@@ -67,11 +62,9 @@ golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
 golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
 golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
-golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs=
-golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
 golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
-golang.org/x/net v0.32.0 h1:ZqPmj8Kzc+Y6e0+skZsuACbx+wzMgo5MQsJh9Qd6aYI=
-golang.org/x/net v0.32.0/go.mod h1:CwU0IoeOlnQQWJ6ioyFrfRuomB8GKF6KbYXZVyeXNfs=
+golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
+golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -88,7 +81,6 @@ golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
@@ -98,7 +90,6 @@ golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
 golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
 golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
-golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58=
 golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
 golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=