Skip to content
This repository was archived by the owner on May 14, 2024. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ldapjs/node-ldapjs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.0.2
Choose a base ref
...
head repository: ldapjs/node-ldapjs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v2.0.0
Choose a head ref

Commits on Oct 16, 2016

  1. Copy the full SHA
    fae19b8 View commit details

Commits on Jan 16, 2017

  1. Copy the full SHA
    87f8e25 View commit details

Commits on Feb 6, 2017

  1. [Docs] Fix a typo

    Examples should be perfect !
    sd65 authored Feb 6, 2017
    Copy the full SHA
    11f8f12 View commit details

Commits on Jan 27, 2018

  1. Update Travis CI urls

    gudatcomputers authored Jan 27, 2018
    Copy the full SHA
    ad451ed View commit details

Commits on Feb 3, 2018

  1. Copy the full SHA
    865b659 View commit details

Commits on Feb 12, 2018

  1. Updating the package.json to use new ldap-filter module

    Farheen.aslam committed Feb 12, 2018
    Copy the full SHA
    b9458f1 View commit details

Commits on Aug 25, 2019

  1. Merge pull request #468 from farheen14aslam/master

    Updating the package.json to use new ldap-filter module
    jsumners authored Aug 25, 2019
    Copy the full SHA
    365365c View commit details
  2. Remove dependency on Bunyan

    jsumners committed Aug 25, 2019
    Copy the full SHA
    e9e8033 View commit details
  3. Copy the full SHA
    2e2a078 View commit details
  4. Merge pull request #399 from jsumners/no-bunyan

    Remove dependency on Bunyan
    jsumners authored Aug 25, 2019
    Copy the full SHA
    2120ba1 View commit details
  5. Merge pull request #466 from thelounge/no-dtrace

    Remove dtrace-provider from optionalDependencies
    jsumners authored Aug 25, 2019
    Copy the full SHA
    efd5070 View commit details
  6. Merge pull request #414 from sd65/patch-1

    [Docs] Fix a typo
    jsumners authored Aug 25, 2019
    Copy the full SHA
    88e4374 View commit details
  7. Merge pull request #393 from cloudron-io/master

    doc: more explanation about unbind
    jsumners authored Aug 25, 2019
    Copy the full SHA
    cf49ee0 View commit details
  8. Copy the full SHA
    2ce7468 View commit details
  9. Copy the full SHA
    5f21dbf View commit details

Commits on Aug 26, 2019

  1. Copy the full SHA
    b66da2c View commit details
  2. Merge pull request #523 from ManfredSteiner/next

    Fixing issue #434 (can delete attributes)
    jsumners authored Aug 26, 2019
    Copy the full SHA
    95ee4f5 View commit details
  3. Merge pull request #405 from pbatey/master

    destroy socket if auto-bind fails
    jsumners authored Aug 26, 2019
    Copy the full SHA
    ac55fba View commit details
  4. Merge pull request #411 from dirk-olmes/docfix

    Fix table layout for the change operation
    jsumners authored Aug 26, 2019
    Copy the full SHA
    068ea4e View commit details
  5. Update ldap filter (#521)

    * update ldap-filter v0.3.3
    
    * allow escaped characters
    
    * remove failing tests
    
    * remove arrow function
    
    * remove template string
    UziTech authored and jsumners committed Aug 26, 2019
    Copy the full SHA
    400af20 View commit details
  6. Merge pull request #522 from UziTech/update-uuid

    update uuid and tests to work with windows
    jsumners authored Aug 26, 2019
    Copy the full SHA
    f1acfee View commit details
  7. Document reconnect option. (#504)

    * Fix typo.
    
    *  Document `reconnect` option.
    
    Fixes #392
    simono authored and jsumners committed Aug 26, 2019
    Copy the full SHA
    736b570 View commit details

Commits on Aug 27, 2019

  1. add a callback optionnal parameter for server.close method (#528)

    * add a callback optionnal parameter for server.close method
    
    net and tls server.close method accept an optional callback parameter.
    ldapjs server.close method delegates to net or tls server.close method and accept now an optional callback parameter...
    
    * add tests for server.close callback
    stalb authored and jsumners committed Aug 27, 2019
    Copy the full SHA
    e4264f7 View commit details
  2. store buffer on extended request

    dododedodonl committed Aug 27, 2019
    Copy the full SHA
    b87e4bb View commit details
  3. Copy the full SHA
    a4b8b11 View commit details
  4. Merge pull request #530 from ldapjs/fix-priv

    Fix privileged port access in tests
    jsumners authored Aug 27, 2019
    Copy the full SHA
    0eca4b6 View commit details
  5. Support Node.js 10 (#497)

    * Support node 10
    
    * remove arrow function
    acappella2017 authored and jsumners committed Aug 27, 2019
    Copy the full SHA
    a8b09f3 View commit details
  6. Merge pull request #529 from dododedodonl/next

    Store buffer on extended request
    jsumners authored Aug 27, 2019
    Copy the full SHA
    bdbc1b1 View commit details
  7. Copy the full SHA
    210d4c6 View commit details
  8. Merge pull request #532 from ldapjs/back-to-tap

    Convert tests back to node-tap
    jsumners authored Aug 27, 2019
    Copy the full SHA
    426c6a7 View commit details
  9. Copy the full SHA
    22c9acb View commit details
  10. Merge pull request #533 from ldapjs/dep-updates

    Update dependencies to latest
    jsumners authored Aug 27, 2019
    Copy the full SHA
    b13e50a View commit details
  11. Copy the full SHA
    6b514b9 View commit details
  12. Merge pull request #536 from ldapjs/parallelize-tests

    Refactor tests to be independent of each other
    jsumners authored Aug 27, 2019
    Copy the full SHA
    9b05c1c View commit details
  13. Update travis config (#537)

    * Update travis config
    
    * Coverage and caching
    
    * Update README with badges and correct issues link
    
    * Update .travis.yml
    
    Co-Authored-By: Tony Brix <tony@brix.ninja>
    
    * Update .travis.yml
    
    Co-Authored-By: Tony Brix <tony@brix.ninja>
    
    * Add windows
    
    * Remove Windows. Does not work on Travis
    
    * Use jobs style config
    
    * Tweak target vesions
    
    * Fix script
    
    * How about this?
    jsumners authored Aug 27, 2019
    Copy the full SHA
    d5fa042 View commit details
  14. fix travis-ci (#538)

    * fix travis-ci
    
    * add node_js to future lint job
    
    * add future windows tests
    UziTech authored and jsumners committed Aug 27, 2019
    Copy the full SHA
    332de11 View commit details
  15. Apply standard linting to the code base (#539)

    * Apply standard linting to the code base
    
    * Specify files to lint
    
    * Run lint as first stage
    
    * Update travis config
    jsumners authored Aug 27, 2019
    Copy the full SHA
    e2c9b12 View commit details
  16. Copy the full SHA
    ce63253 View commit details
  17. Merge pull request #540 from ldapjs/pkg-cleanup

    Touch up package.json, license, readme
    jsumners authored Aug 27, 2019
    Copy the full SHA
    c004751 View commit details
  18. Remove makefile stuff

    jsumners committed Aug 27, 2019
    Copy the full SHA
    ce07277 View commit details
  19. Copy the full SHA
    228aa3a View commit details
  20. Copy the full SHA
    02dd19d View commit details
  21. Merge pull request #541 from ldapjs/remove-make-cruft

    Remove makefile stuff
    jsumners authored Aug 27, 2019
    Copy the full SHA
    cd426ca View commit details
  22. Copy the full SHA
    c1ebea1 View commit details
  23. explicitly list os and script

    UziTech committed Aug 27, 2019
    Copy the full SHA
    303d963 View commit details
  24. Merge pull request #542 from UziTech/fix-tests-windows

    Fix testing on windows
    jsumners authored Aug 27, 2019
    Copy the full SHA
    b62e303 View commit details
  25. Resolve issue #336

    jsumners committed Aug 27, 2019
    Copy the full SHA
    9a8f607 View commit details
  26. Merge pull request #543 from ldapjs/issue-336

    Resolve issue #336
    jsumners authored Aug 27, 2019
    Copy the full SHA
    b0d2c1a View commit details

Commits on Aug 28, 2019

  1. Add test for issue #480

    jsumners committed Aug 28, 2019
    Copy the full SHA
    528a78b View commit details
  2. Merge pull request #545 from ldapjs/issue-480

    Add test for issue #480
    jsumners authored Aug 28, 2019
    Copy the full SHA
    9c6e58c View commit details
Showing with 9,908 additions and 10,856 deletions.
  1. +0 −6 .dir-locals.el
  2. +41 −0 .github/workflows/integration.yml
  3. +51 −0 .github/workflows/main.yml
  4. +73 −4 .gitignore
  5. +0 −9 .gitmodules
  6. +6 −0 .taprc
  7. +0 −6 .travis.yml
  8. +4 −0 CHANGES.md
  9. +1 −1 LICENSE
  10. +0 −58 Makefile
  11. +5 −5 README.md
  12. +0 −171 bin/ldapjs-add
  13. +0 −167 bin/ldapjs-compare
  14. +0 −148 bin/ldapjs-delete
  15. +0 −185 bin/ldapjs-modify
  16. +0 −326 bin/ldapjs-search
  17. +0 −1 deps/javascriptlint
  18. +0 −1 deps/jsstyle
  19. +0 −1 deps/restdown
  20. +8 −0 docker-compose.yml
  21. +35 −5 docs/client.md
  22. +1 −1 docs/examples.md
  23. +2 −2 docs/guide.md
  24. +24 −4 docs/server.md
  25. +107 −129 examples/inmemory.js
  26. +23 −30 lib/assert.js
  27. +78 −92 lib/attribute.js
  28. +119 −124 lib/change.js
  29. +595 −817 lib/client/client.js
  30. +7 −0 lib/client/constants.js
  31. +18 −51 lib/client/index.js
  32. +25 −0 lib/client/message-tracker/ge-window.js
  33. +23 −0 lib/client/message-tracker/id-generator.js
  34. +151 −0 lib/client/message-tracker/index.js
  35. +34 −0 lib/client/message-tracker/purge-abandoned.js
  36. +36 −0 lib/client/request-queue/enqueue.js
  37. +24 −0 lib/client/request-queue/flush.js
  38. +39 −0 lib/client/request-queue/index.js
  39. +12 −0 lib/client/request-queue/purge.js
  40. +71 −73 lib/client/search_pager.js
  41. +33 −39 lib/controls/control.js
  42. +45 −51 lib/controls/entry_change_notification_control.js
  43. +53 −46 lib/controls/index.js
  44. +48 −53 lib/controls/paged_results_control.js
  45. +43 −46 lib/controls/persistent_search_control.js
  46. +60 −64 lib/controls/server_side_sorting_request_control.js
  47. +49 −52 lib/controls/server_side_sorting_response_control.js
  48. +94 −0 lib/controls/virtual_list_view_request_control.js
  49. +112 −0 lib/controls/virtual_list_view_response_control.js
  50. +50 −0 lib/corked_emitter.js
  51. +251 −278 lib/dn.js
  52. +39 −43 lib/dtrace.js
  53. +5 −2 lib/errors/codes.js
  54. +71 −78 lib/errors/index.js
  55. +15 −18 lib/filters/and_filter.js
  56. +20 −24 lib/filters/approx_filter.js
  57. +31 −37 lib/filters/equality_filter.js
  58. +16 −17 lib/filters/escape.js
  59. +35 −42 lib/filters/ext_filter.js
  60. +32 −35 lib/filters/filter.js
  61. +20 −23 lib/filters/ge_filter.js
  62. +125 −123 lib/filters/index.js
  63. +20 −23 lib/filters/le_filter.js
  64. +13 −15 lib/filters/not_filter.js
  65. +15 −17 lib/filters/or_filter.js
  66. +19 −23 lib/filters/presence_filter.js
  67. +44 −51 lib/filters/substr_filter.js
  68. +29 −40 lib/index.js
  69. +6 −0 lib/logger.js
  70. +45 −48 lib/messages/abandon_request.js
  71. +18 −20 lib/messages/abandon_response.js
  72. +74 −86 lib/messages/add_request.js
  73. +13 −15 lib/messages/add_response.js
  74. +47 −51 lib/messages/bind_request.js
  75. +13 −15 lib/messages/bind_response.js
  76. +44 −46 lib/messages/compare_request.js
  77. +18 −21 lib/messages/compare_response.js
  78. +33 −36 lib/messages/del_request.js
  79. +13 −15 lib/messages/del_response.js
  80. +71 −53 lib/messages/ext_request.js
  81. +45 −53 lib/messages/ext_response.js
  82. +29 −30 lib/messages/index.js
  83. +52 −59 lib/messages/message.js
  84. +59 −62 lib/messages/moddn_request.js
  85. +13 −15 lib/messages/moddn_response.js
  86. +48 −50 lib/messages/modify_request.js
  87. +13 −15 lib/messages/modify_response.js
  88. +152 −159 lib/messages/parser.js
  89. +64 −72 lib/messages/result.js
  90. +93 −102 lib/messages/search_entry.js
  91. +51 −55 lib/messages/search_reference.js
  92. +100 −98 lib/messages/search_request.js
  93. +63 −76 lib/messages/search_response.js
  94. +31 −34 lib/messages/unbind_request.js
  95. +26 −28 lib/messages/unbind_response.js
  96. +52 −66 lib/persistent_search.js
  97. +1 −2 lib/protocol.js
  98. +440 −484 lib/server.js
  99. +40 −35 lib/url.js
  100. +28 −30 package.json
  101. +21 −0 test-integration/client/connect.test.js
  102. +91 −0 test-integration/client/issues.test.js
  103. +104 −125 test/attribute.test.js
  104. +156 −163 test/change.test.js
  105. +1,243 −951 test/client.test.js
  106. +42 −65 test/controls/control.test.js
  107. +66 −0 test/controls/entry_change_notification_control.test.js
  108. +0 −88 test/controls/entry_change_notification_control_test.js
  109. +61 −0 test/controls/paged_results_control.test.js
  110. +0 −86 test/controls/paged_results_control_test.js
  111. +65 −70 test/controls/persistent_search_control.test.js
  112. +56 −70 test/controls/server_side_sorting_control_request.test.js
  113. +72 −84 test/controls/server_side_sorting_control_response.test.js
  114. +94 −0 test/controls/virtual_list_view_request_control.test.js
  115. +68 −0 test/controls/virtual_list_view_response_control.test.js
  116. +104 −0 test/corked_emitter.test.js
  117. +185 −214 test/dn.test.js
  118. +47 −33 test/errors.test.js
  119. +27 −52 test/filters/and.test.js
  120. +61 −86 test/filters/approx.test.js
  121. +112 −143 test/filters/eq.test.js
  122. +63 −91 test/filters/ext.test.js
  123. +80 −107 test/filters/ge.test.js
  124. +80 −108 test/filters/le.test.js
  125. +24 −49 test/filters/not.test.js
  126. +27 −52 test/filters/or.test.js
  127. +111 −126 test/filters/parse.test.js
  128. +58 −83 test/filters/presence.test.js
  129. +107 −136 test/filters/substr.test.js
  130. BIN test/imgs/test.jpg
  131. +86 −100 test/laundry.test.js
  132. +47 −0 test/lib/client/message-tracker/ge-window.test.js
  133. +21 −0 test/lib/client/message-tracker/id-generator.test.js
  134. +201 −0 test/lib/client/message-tracker/index.test.js
  135. +64 −0 test/lib/client/message-tracker/purge-abandoned.test.js
  136. +82 −0 test/lib/client/request-queue/enqueue.test.js
  137. +51 −0 test/lib/client/request-queue/flush.test.js
  138. +18 −0 test/lib/client/request-queue/purge.test.js
  139. +111 −137 test/messages/add_request.test.js
  140. +41 −61 test/messages/add_response.test.js
  141. +42 −64 test/messages/bind_request.test.js
  142. +41 −61 test/messages/bind_response.test.js
  143. +44 −67 test/messages/compare_request.test.js
  144. +41 −61 test/messages/compare_response.test.js
  145. +32 −57 test/messages/del_request.test.js
  146. +41 −61 test/messages/del_response.test.js
  147. +107 −58 test/messages/ext_request.test.js
  148. +49 −69 test/messages/ext_response.test.js
  149. +39 −61 test/messages/moddn_request.test.js
  150. +41 −61 test/messages/moddn_response.test.js
  151. +68 −96 test/messages/modify_request.test.js
  152. +41 −61 test/messages/modify_response.test.js
  153. +30 −45 test/messages/parser.test.js
  154. +78 −103 test/messages/search_entry.test.js
  155. +67 −91 test/messages/search_request.test.js
  156. +41 −61 test/messages/search_response.test.js
  157. +26 −46 test/messages/unbind_request.test.js
  158. +272 −251 test/server.test.js
  159. +0 −28 test/test.js
  160. +49 −65 test/url.test.js
  161. +17 −0 test/utils.js
  162. +0 −139 tools/jsl.node.conf
  163. +0 −4 tools/jsstyle.conf
  164. +0 −43 tools/mk/Makefile.defs
  165. +0 −44 tools/mk/Makefile.deps
  166. +0 −291 tools/mk/Makefile.targ
6 changes: 0 additions & 6 deletions .dir-locals.el

This file was deleted.

41 changes: 41 additions & 0 deletions .github/workflows/integration.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
name: 'Integration Tests'

# Notes:
# https://github.community/t5/GitHub-Actions/Github-Actions-services-not-reachable/m-p/30739/highlight/true#M538

on:
pull_request:
branches:
- master
- next

jobs:
baseline:
name: Baseline Tests
runs-on: ubuntu-latest

# services:
# openldap:
# image: docker.pkg.github.com/ldapjs/docker-test-openldap/openldap:1.0
# ports:
# - 389:389
# - 636:636

steps:
- uses: actions/checkout@v1
- uses: actions/setup-node@v1

# Hack way to start service since GitHub doesn't integrate with its own services
- name: Docker login
run: docker login docker.pkg.github.com -u ${GITHUB_ACTOR} -p ${GITHUB_TOKEN}
env:
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
- name: Pull Docker image
run: docker pull "docker.pkg.github.com/ldapjs/docker-test-openldap/openldap:latest"
- name: Start OpenLDAP service
run: docker run -it -d --name openldap -p 389:389 -p 636:636 docker.pkg.github.com/ldapjs/docker-test-openldap/openldap:latest

- name: Install Packages
run: npm install
- name: Run Tests
run: npm run test:integration
51 changes: 51 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
name: 'Lint And Test'

on:
pull_request:
branches:
- master
- next

jobs:
lint:
name: Lint Check
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: actions/setup-node@v1
- name: Install Packages
run: npm install
- name: Lint Code
run: npm run lint:ci

run_tests:
name: Unit Tests
strategy:
matrix:
os:
- ubuntu-latest
- windows-latest
node:
- 10.13.0
- 10.x
- 12.x
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v1
- uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node }}
- name: Install Packages
run: npm install
- name: Run Tests
run: npm run test:ci
- name: Coveralls Parallel
uses: coverallsapp/github-action@master
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
parallel: true
- name: Coveralls Finished
uses: coverallsapp/github-action@master
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
parallel-finished: true
77 changes: 73 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,77 @@
build
node_modules
coverage
*.log
*.ldif
*.tar.*
*.tgz

# Lock files
pnpm-lock.yaml
shrinkwrap.yaml
package-lock.json
yarn.lock

# Logs
logs
*.log
npm-debug.log*

# Runtime data
pids
*.pid
*.seed

# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov

# Coverage directory used by tools like istanbul
coverage

# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
.grunt

# node-waf configuration
.lock-wscript

# Compiled binary addons (http://nodejs.org/api/addons.html)
build/Release

# Dependency directory
node_modules

# Optional npm cache directory
.npm

# Optional REPL history
.node_repl_history

# 0x
.__browserify_string_empty.js
profile-*
*.flamegraph

# tap --cov
.nyc_output/

# JetBrains IntelliJ IDEA
.idea/
*.iml

# VS Code
.vscode/

# xcode
build/*
*.mode1
*.mode1v3
*.mode2v3
*.perspective
*.perspectivev3
*.pbxuser
*.xcworkspace
xcuserdata

# macOS
.DS_Store

# keys
*.pem
*.env.json
*.env
9 changes: 0 additions & 9 deletions .gitmodules

This file was deleted.

6 changes: 6 additions & 0 deletions .taprc
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
esm: false
jsx: false
ts: false

files:
- 'test/**/*.test.js'
6 changes: 0 additions & 6 deletions .travis.yml

This file was deleted.

4 changes: 4 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# ldapjs Changelog

## 2.0.0

- Going foward, please see https://github.com/ldapjs/node-ldapjs/releases

## 1.0.2

- Update dtrace-provider dependency
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2011 Mark Cavage, All rights reserved.
Copyright (c) 2019 LDAPjs, All rights reserved.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
58 changes: 0 additions & 58 deletions Makefile

This file was deleted.

10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
# LDAPjs

[!['Build status'][travis_image_url]][travis_page_url]

[travis_image_url]: https://api.travis-ci.org/mcavage/node-ldapjs.svg
[travis_page_url]: https://travis-ci.org/mcavage/node-ldapjs
[![Build Status](https://github.com/ldapjs/node-ldapjs/workflows/.github/workflows/main.yml/badge.svg)]
[![Coverage Status](https://coveralls.io/repos/github/ldapjs/node-ldapjs/badge.svg)]

LDAPjs makes the LDAP protocol a first class citizen in Node.js.

@@ -45,10 +43,12 @@ client on your system:

npm install ldapjs

DTrace support is included in ldapjs. To enable it, `npm install dtrace-provider`.

## License

MIT.

## Bugs

See <https://github.com/mcavage/node-ldapjs/issues>.
See <https://github.com/ldapjs/node-ldapjs/issues>.
Loading