Merge pull request liberkee#58 from 6labs/feature/URI_checking

Js URI checking
suretec · Mar 2, 2018 · 1a23e5d · 1a23e5d
2 parents 39ab117 + d897523
commit 1a23e5d
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 4 deletions.
diff --git a/libs/ldap_async_wrap.js b/libs/ldap_async_wrap.js
@@ -62,6 +62,9 @@ class LDAPAsyncWrap {
   initialize() {
     return new Promise((resolve, reject) => {
       if (this._stateClient === E_STATES.CREATED) {
+        if (!checkParameters.checkURI(this._hostAddress)) {
+          return reject(new Error(`Could not parse LDAP URI(S): ${this._hostAddress}`));
+        }
         this._binding.initialize(this._hostAddress, (err, result) => {
           if (err) {
             const CustomError = errorHandler(err);
@@ -90,8 +93,8 @@ class LDAPAsyncWrap {
   startTLS(pathToCertFile) {
     return new Promise((resolve, reject) => {
       if (this._stateClient === E_STATES.INITIALIZED) {
-        const path = pathToCertFile === undefined ? '' : pathToCertFile;
-        this._binding.startTls(path, (err, res) => {
+        const certificatePath = pathToCertFile === undefined ? '' : pathToCertFile;
+        this._binding.startTls(certificatePath, (err, res) => {
           if (err) {
             const CustomError = errorHandler(err);
             reject(new CustomError(errorMessages.ldapStartTlsErrorMessage));
@@ -265,7 +268,9 @@ class LDAPAsyncWrap {
 
         this._searchID += 1;
         const timeValue = timeVal === undefined ? this._timeVal : timeVal;
-        resolve(new SearchStream(searchBase, scopeObject[scope], searchFilter, pageSize, this._searchID, this._binding, timeValue));
+
+        resolve(new SearchStream(searchBase, scopeObject[scope], searchFilter,
+          pageSize, this._searchID, this._binding, timeValue));
       }
       reject(new StateError(errorMessages.bindErrorMessage));
     });

diff --git a/libs/utils/check_variable_format.js b/libs/utils/check_variable_format.js
@@ -125,6 +125,18 @@ class CheckParam {
     return entryAttr;
   }
 
+
+  /**
+   * 
+   * Static method that checks if a string is a proper ldap URI.
+   * @param {String} uri String that represents the ldap server URI
+   */
+  static checkURI(uri) {
+
+   return  uri.startsWith('ldap://') || uri.startsWith('ldaps://');
+
+  }
+
 }
 
 module.exports = CheckParam;
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "openldapjs",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "A ldap client nodejs",
   "main": "index.js",
   "repository": {