Swap asn1 package

jsumners · jsumners · commit 9fe58a44a228 · 2023-02-22T14:09:27.000-05:00
diff --git a/lib/attribute.js b/lib/attribute.js
@@ -2,7 +2,7 @@
 
 const assert = require('assert')
 
-const asn1 = require('asn1')
+const asn1 = require('@ldapjs/asn1')
 
 const Protocol = require('./protocol')
 
diff --git a/lib/controls/control.js b/lib/controls/control.js
@@ -2,7 +2,7 @@
 
 const assert = require('assert-plus')
 
-// var asn1 = require('asn1')
+// var asn1 = require('@ldapjs/asn1')
 
 // var Protocol = require('../protocol')
 
diff --git a/lib/controls/entry_change_notification_control.js b/lib/controls/entry_change_notification_control.js
@@ -1,7 +1,7 @@
 const assert = require('assert-plus')
 const util = require('util')
 
-const asn1 = require('asn1')
+const asn1 = require('@ldapjs/asn1')
 
 const Control = require('./control')
 
diff --git a/lib/controls/index.js b/lib/controls/index.js
@@ -1,7 +1,7 @@
 // Copyright 2011 Mark Cavage, Inc.  All rights reserved.
 
 const assert = require('assert')
-const Ber = require('asn1').Ber
+const Ber = require('@ldapjs/asn1').Ber
 
 const Control = require('./control')
 const EntryChangeNotificationControl =
diff --git a/lib/controls/paged_results_control.js b/lib/controls/paged_results_control.js
@@ -1,7 +1,7 @@
 const assert = require('assert-plus')
 const util = require('util')
 
-const asn1 = require('asn1')
+const asn1 = require('@ldapjs/asn1')
 
 const Control = require('./control')
 
diff --git a/lib/controls/persistent_search_control.js b/lib/controls/persistent_search_control.js
@@ -3,7 +3,7 @@
 const assert = require('assert-plus')
 const util = require('util')
 
-const asn1 = require('asn1')
+const asn1 = require('@ldapjs/asn1')
 
 const Control = require('./control')
 
diff --git a/lib/controls/server_side_sorting_request_control.js b/lib/controls/server_side_sorting_request_control.js
@@ -1,7 +1,7 @@
 const assert = require('assert-plus')
 const util = require('util')
 
-const asn1 = require('asn1')
+const asn1 = require('@ldapjs/asn1')
 
 const Control = require('./control')
 
diff --git a/lib/controls/server_side_sorting_response_control.js b/lib/controls/server_side_sorting_response_control.js
@@ -1,7 +1,7 @@
 const assert = require('assert-plus')
 const util = require('util')
 
-const asn1 = require('asn1')
+const asn1 = require('@ldapjs/asn1')
 
 const Control = require('./control')
 const CODES = require('../errors/codes')
diff --git a/lib/controls/virtual_list_view_request_control.js b/lib/controls/virtual_list_view_request_control.js
@@ -1,7 +1,7 @@
 const assert = require('assert-plus')
 const util = require('util')
 
-const asn1 = require('asn1')
+const asn1 = require('@ldapjs/asn1')
 
 const Control = require('./control')
 
diff --git a/lib/controls/virtual_list_view_response_control.js b/lib/controls/virtual_list_view_response_control.js
@@ -1,7 +1,7 @@
 const assert = require('assert-plus')
 const util = require('util')
 
-const asn1 = require('asn1')
+const asn1 = require('@ldapjs/asn1')
 
 const Control = require('./control')
 const CODES = require('../errors/codes')
diff --git a/lib/filters/equality_filter.js b/lib/filters/equality_filter.js
@@ -3,7 +3,7 @@
 const assert = require('assert-plus')
 const util = require('util')
 
-const ASN1 = require('asn1').Ber
+const ASN1 = require('@ldapjs/asn1').Ber
 const parents = require('ldap-filter')
 
 const Filter = require('./filter')
diff --git a/lib/filters/index.js b/lib/filters/index.js
@@ -2,7 +2,7 @@
 
 const assert = require('assert')
 
-const asn1 = require('asn1')
+const asn1 = require('@ldapjs/asn1')
 
 const parents = require('ldap-filter')
 
diff --git a/lib/messages/bind_request.js b/lib/messages/bind_request.js
@@ -3,7 +3,7 @@
 const assert = require('assert-plus')
 const util = require('util')
 
-const asn1 = require('asn1')
+const asn1 = require('@ldapjs/asn1')
 
 const LDAPMessage = require('./message')
 const Protocol = require('../protocol')
diff --git a/lib/messages/message.js b/lib/messages/message.js
@@ -3,7 +3,7 @@
 const assert = require('assert-plus')
 const util = require('util')
 
-const asn1 = require('asn1')
+const asn1 = require('@ldapjs/asn1')
 
 const logger = require('../logger')
 // var Control = require('../controls').Control
diff --git a/lib/messages/parser.js b/lib/messages/parser.js
@@ -4,7 +4,7 @@ const EventEmitter = require('events').EventEmitter
 const util = require('util')
 
 const assert = require('assert-plus')
-const asn1 = require('asn1')
+const asn1 = require('@ldapjs/asn1')
 // var VError = require('verror').VError
 const logger = require('../logger')
 
diff --git a/lib/messages/result.js b/lib/messages/result.js
@@ -3,7 +3,7 @@
 const assert = require('assert-plus')
 const util = require('util')
 
-// var asn1 = require('asn1')
+// var asn1 = require('@ldapjs/asn1')
 
 const dtrace = require('../dtrace')
 const LDAPMessage = require('./message')
diff --git a/lib/messages/search_entry.js b/lib/messages/search_entry.js
@@ -3,7 +3,7 @@
 const assert = require('assert-plus')
 const util = require('util')
 
-// var asn1 = require('asn1')
+// var asn1 = require('@ldapjs/asn1')
 
 const LDAPMessage = require('./message')
 const Attribute = require('../attribute')
diff --git a/lib/messages/search_reference.js b/lib/messages/search_reference.js
@@ -3,7 +3,7 @@
 const assert = require('assert-plus')
 const util = require('util')
 
-// var asn1 = require('asn1')
+// var asn1 = require('@ldapjs/asn1')
 
 const LDAPMessage = require('./message')
 const Protocol = require('../protocol')
diff --git a/lib/messages/search_request.js b/lib/messages/search_request.js
@@ -3,7 +3,7 @@
 const assert = require('assert-plus')
 const util = require('util')
 
-const asn1 = require('asn1')
+const asn1 = require('@ldapjs/asn1')
 
 const LDAPMessage = require('./message')
 // var LDAPResult = require('./result')
diff --git a/lib/server.js b/lib/server.js
@@ -6,7 +6,7 @@ const net = require('net')
 const tls = require('tls')
 const util = require('util')
 
-// var asn1 = require('asn1')
+// var asn1 = require('@ldapjs/asn1')
 const VError = require('verror').VError
 
 const dn = require('./dn')
diff --git a/package.json b/package.json
@@ -17,8 +17,8 @@
     "node": ">=10.13.0"
   },
   "dependencies": {
+    "@ldapjs/asn1": "^1.0.0-rc.1",
     "abstract-logging": "^2.0.0",
-    "asn1": "^0.2.4",
     "assert-plus": "^1.0.0",
     "backoff": "^2.5.0",
     "ldap-filter": "^0.3.3",
diff --git a/test/attribute.test.js b/test/attribute.test.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const { test } = require('tap')
-const { BerReader, BerWriter } = require('asn1')
+const { BerReader, BerWriter } = require('@ldapjs/asn1')
 const { Attribute } = require('../lib')
 
 test('new no args', function (t) {
diff --git a/test/change.test.js b/test/change.test.js
@@ -3,7 +3,7 @@
 const fs = require('fs')
 const path = require('path')
 const { test } = require('tap')
-const { BerReader, BerWriter } = require('asn1')
+const { BerReader, BerWriter } = require('@ldapjs/asn1')
 const { Attribute, Change } = require('../lib')
 
 test('new no args', function (t) {
diff --git a/test/client.test.js b/test/client.test.js
@@ -509,7 +509,7 @@ tap.test('add success with object', function (t) {
 })
 
 tap.test('add buffer', function (t) {
-  const { BerReader } = require('asn1')
+  const { BerReader } = require('@ldapjs/asn1')
   const dn = `cn=add, ${SUFFIX}`
   const attribute = 'thumbnailPhoto'
   const binary = 0xa5
@@ -729,7 +729,7 @@ tap.test('modify DN excessive length (GH-480)', function (t) {
 })
 
 tap.test('modify DN excessive superior length', function (t) {
-  const { BerReader, BerWriter } = require('asn1')
+  const { BerReader, BerWriter } = require('@ldapjs/asn1')
   const ModifyDNRequest = require('../lib/messages/moddn_request')
   const ber = new BerWriter()
   const entry = 'cn=Test     User,ou=A Long OU                  ,ou=Another Long OU                ,ou=Another Long OU              ,dc=acompany,DC=io'
diff --git a/test/controls/control.test.js b/test/controls/control.test.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const { test } = require('tap')
-const { BerReader, BerWriter } = require('asn1')
+const { BerReader, BerWriter } = require('@ldapjs/asn1')
 const { Control, getControl } = require('../../lib')
 
 test('new no args', function (t) {
diff --git a/test/controls/entry_change_notification_control.test.js b/test/controls/entry_change_notification_control.test.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const { test } = require('tap')
-const { BerReader, BerWriter } = require('asn1')
+const { BerReader, BerWriter } = require('@ldapjs/asn1')
 const { getControl, EntryChangeNotificationControl } = require('../../lib')
 
 test('new no args', function (t) {
diff --git a/test/controls/paged_results_control.test.js b/test/controls/paged_results_control.test.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const { test } = require('tap')
-const { BerReader, BerWriter } = require('asn1')
+const { BerReader, BerWriter } = require('@ldapjs/asn1')
 const { getControl, PagedResultsControl } = require('../../lib')
 
 test('new no args', function (t) {
diff --git a/test/controls/persistent_search_control.test.js b/test/controls/persistent_search_control.test.js
@@ -2,7 +2,7 @@
 
 const test = require('tap').test
 
-const asn1 = require('asn1')
+const asn1 = require('@ldapjs/asn1')
 
 const BerReader = asn1.BerReader
 const BerWriter = asn1.BerWriter
diff --git a/test/controls/server_side_sorting_control_request.test.js b/test/controls/server_side_sorting_control_request.test.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const { test } = require('tap')
-const { BerReader, BerWriter } = require('asn1')
+const { BerReader, BerWriter } = require('@ldapjs/asn1')
 const { getControl, ServerSideSortingRequestControl: SSSRControl } = require('../../lib')
 
 test('new no args', function (t) {
diff --git a/test/controls/server_side_sorting_control_response.test.js b/test/controls/server_side_sorting_control_response.test.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const { test } = require('tap')
-const { BerReader, BerWriter } = require('asn1')
+const { BerReader, BerWriter } = require('@ldapjs/asn1')
 const ldap = require('../../lib')
 const { getControl, ServerSideSortingResponseControl: SSSResponseControl } = ldap
 const OID = '1.2.840.113556.1.4.474'
diff --git a/test/controls/virtual_list_view_request_control.test.js b/test/controls/virtual_list_view_request_control.test.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const { test } = require('tap')
-const { BerReader, BerWriter } = require('asn1')
+const { BerReader, BerWriter } = require('@ldapjs/asn1')
 const { getControl, VirtualListViewRequestControl: VLVRControl } = require('../../lib')
 
 test('VLV request - new no args', function (t) {
diff --git a/test/controls/virtual_list_view_response_control.test.js b/test/controls/virtual_list_view_response_control.test.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const { test } = require('tap')
-const { BerReader, BerWriter } = require('asn1')
+const { BerReader, BerWriter } = require('@ldapjs/asn1')
 const ldap = require('../../lib')
 const { getControl, VirtualListViewResponseControl: VLVResponseControl } = require('../../lib')
 const OID = '2.16.840.1.113730.3.4.10'
diff --git a/test/filters/approx.test.js b/test/filters/approx.test.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const { test } = require('tap')
-const { BerReader, BerWriter } = require('asn1')
+const { BerReader, BerWriter } = require('@ldapjs/asn1')
 const { filters: { ApproximateFilter } } = require('../../lib')
 
 test('Construct no args', function (t) {
diff --git a/test/filters/eq.test.js b/test/filters/eq.test.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const { test } = require('tap')
-const { BerReader, BerWriter } = require('asn1')
+const { BerReader, BerWriter } = require('@ldapjs/asn1')
 const { filters: { EqualityFilter } } = require('../../lib')
 
 test('Construct no args', function (t) {
diff --git a/test/filters/ge.test.js b/test/filters/ge.test.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const { test } = require('tap')
-const { BerReader, BerWriter } = require('asn1')
+const { BerReader, BerWriter } = require('@ldapjs/asn1')
 const { filters: { GreaterThanEqualsFilter } } = require('../../lib')
 
 test('Construct no args', function (t) {
diff --git a/test/filters/le.test.js b/test/filters/le.test.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const { test } = require('tap')
-const { BerReader, BerWriter } = require('asn1')
+const { BerReader, BerWriter } = require('@ldapjs/asn1')
 const { filters: { LessThanEqualsFilter } } = require('../../lib')
 
 test('Construct no args', function (t) {
diff --git a/test/filters/presence.test.js b/test/filters/presence.test.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const { test } = require('tap')
-const { BerReader, BerWriter } = require('asn1')
+const { BerReader, BerWriter } = require('@ldapjs/asn1')
 const { filters: { PresenceFilter } } = require('../../lib')
 
 test('Construct no args', function (t) {
diff --git a/test/filters/substr.test.js b/test/filters/substr.test.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const { test } = require('tap')
-const { BerReader, BerWriter } = require('asn1')
+const { BerReader, BerWriter } = require('@ldapjs/asn1')
 const { filters: { SubstringFilter } } = require('../../lib')
 
 test('Construct no args', function (t) {
diff --git a/test/messages/add_request.test.js b/test/messages/add_request.test.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const { test } = require('tap')
-const { BerReader, BerWriter } = require('asn1')
+const { BerReader, BerWriter } = require('@ldapjs/asn1')
 const { AddRequest, Attribute, dn } = require('../../lib')
 
 test('new no args', t => {
diff --git a/test/messages/add_response.test.js b/test/messages/add_response.test.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const { test } = require('tap')
-const { BerReader, BerWriter } = require('asn1')
+const { BerReader, BerWriter } = require('@ldapjs/asn1')
 const { AddResponse } = require('../../lib')
 
 test('new no args', function (t) {
diff --git a/test/messages/bind_request.test.js b/test/messages/bind_request.test.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const { test } = require('tap')
-const { BerReader, BerWriter } = require('asn1')
+const { BerReader, BerWriter } = require('@ldapjs/asn1')
 const { BindRequest, dn } = require('../../lib')
 
 test('new no args', function (t) {
diff --git a/test/messages/bind_response.test.js b/test/messages/bind_response.test.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const { test } = require('tap')
-const { BerReader, BerWriter } = require('asn1')
+const { BerReader, BerWriter } = require('@ldapjs/asn1')
 const { BindResponse } = require('../../lib')
 
 test('new no args', function (t) {
diff --git a/test/messages/compare_request.test.js b/test/messages/compare_request.test.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const { test } = require('tap')
-const { BerReader, BerWriter } = require('asn1')
+const { BerReader, BerWriter } = require('@ldapjs/asn1')
 const { CompareRequest, dn } = require('../../lib')
 
 test('new no args', function (t) {
diff --git a/test/messages/compare_response.test.js b/test/messages/compare_response.test.js
diff --git a/test/messages/del_request.test.js b/test/messages/del_request.test.js
diff --git a/test/messages/del_response.test.js b/test/messages/del_response.test.js
diff --git a/test/messages/ext_request.test.js b/test/messages/ext_request.test.js
diff --git a/test/messages/ext_response.test.js b/test/messages/ext_response.test.js
diff --git a/test/messages/moddn_request.test.js b/test/messages/moddn_request.test.js
diff --git a/test/messages/moddn_response.test.js b/test/messages/moddn_response.test.js
diff --git a/test/messages/modify_request.test.js b/test/messages/modify_request.test.js
diff --git a/test/messages/modify_response.test.js b/test/messages/modify_response.test.js
diff --git a/test/messages/search_entry.test.js b/test/messages/search_entry.test.js
diff --git a/test/messages/search_request.test.js b/test/messages/search_request.test.js
diff --git a/test/messages/search_response.test.js b/test/messages/search_response.test.js
diff --git a/test/messages/unbind_request.test.js b/test/messages/unbind_request.test.js
