Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

LDAP: more options

This commit is contained in:
baslr 2017-03-30 11:03:13 +02:00
parent 984c44e7b0
commit f669fd4b9e
4 changed files with 50 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
js/common/bootstrap/errors.js
View File

@ -219,10 +219,11 @@
"ERROR_LDAP_CANNOT_BIND" : { "code" : 1802, "message" : "cannot bind to a LDAP server" }, "ERROR_LDAP_CANNOT_BIND" : { "code" : 1802, "message" : "cannot bind to a LDAP server" },
"ERROR_LDAP_CANNOT_UNBIND" : { "code" : 1803, "message" : "cannot unbind from a LDAP server" }, "ERROR_LDAP_CANNOT_UNBIND" : { "code" : 1803, "message" : "cannot unbind from a LDAP server" },
"ERROR_LDAP_CANNOT_SEARCH" : { "code" : 1804, "message" : "cannot issue a LDAP search" }, "ERROR_LDAP_CANNOT_SEARCH" : { "code" : 1804, "message" : "cannot issue a LDAP search" },
"ERROR_LDAP_FOUND_NO_OBJECTS" : { "code" : 1805, "message" : "LDAP didn't found any objects" }, "ERROR_LDAP_CANNOT_START_TLS" : { "code" : 1805, "message" : "cannot start a TLS LDAP session" },
"ERROR_LDAP_NOT_ONE_USER_FOUND" : { "code" : 1806, "message" : "LDAP found zero ore more than one user" }, "ERROR_LDAP_FOUND_NO_OBJECTS" : { "code" : 1806, "message" : "LDAP didn't found any objects" },
"ERROR_LDAP_USER_NOT_IDENTIFIED" : { "code" : 1807, "message" : "LDAP found a user, but its not the desired one" }, "ERROR_LDAP_NOT_ONE_USER_FOUND" : { "code" : 1807, "message" : "LDAP found zero ore more than one user" },
"ERROR_LDAP_INVALID_MODE" : { "code" : 1810, "message" : "invalid ldap mode" }, "ERROR_LDAP_USER_NOT_IDENTIFIED" : { "code" : 1808, "message" : "LDAP found a user, but its not the desired one" },
"ERROR_LDAP_INVALID_MODE" : { "code" : 1820, "message" : "invalid ldap mode" },
"ERROR_TASK_INVALID_ID" : { "code" : 1850, "message" : "invalid task id" }, "ERROR_TASK_INVALID_ID" : { "code" : 1850, "message" : "invalid task id" },
"ERROR_TASK_DUPLICATE_ID" : { "code" : 1851, "message" : "duplicate task id" }, "ERROR_TASK_DUPLICATE_ID" : { "code" : 1851, "message" : "duplicate task id" },
"ERROR_TASK_NOT_FOUND" : { "code" : 1852, "message" : "task not found" }, "ERROR_TASK_NOT_FOUND" : { "code" : 1852, "message" : "task not found" },

19
lib/Basics/errors.dat
View File

@ -291,15 +291,16 @@ ERROR_SERVICE_UPLOAD_FAILED,1753,"service upload failed","Will be raised when a
## LDAP errors ## LDAP errors
################################################################################ ################################################################################
ERROR_LDAP_CANNOT_INIT,1800,"cannot init a LDAP connection","cannot init a LDAP connection" ERROR_LDAP_CANNOT_INIT,1800,"cannot init a LDAP connection","can not init a LDAP connection"
ERROR_LDAP_CANNOT_SET_OPTION,1801,"cannot set a LDAP option","cannot set a LDAP option" ERROR_LDAP_CANNOT_SET_OPTION,1801,"cannot set a LDAP option","can not set a LDAP option"
ERROR_LDAP_CANNOT_BIND,1802,"cannot bind to a LDAP server","cannot bind to a LDAP server" ERROR_LDAP_CANNOT_BIND,1802,"cannot bind to a LDAP server","can not bind to a LDAP server"
ERROR_LDAP_CANNOT_UNBIND,1803,"cannot unbind from a LDAP server","cannot unbind from a LDAP server" ERROR_LDAP_CANNOT_UNBIND,1803,"cannot unbind from a LDAP server","can not unbind from a LDAP server"
ERROR_LDAP_CANNOT_SEARCH,1804,"cannot issue a LDAP search","cant search the LDAP server" ERROR_LDAP_CANNOT_SEARCH,1804,"cannot issue a LDAP search","can not search the LDAP server"
ERROR_LDAP_FOUND_NO_OBJECTS,1805,"LDAP didn't found any objects","LDAP didn't found any objects with the specified search query" ERROR_LDAP_CANNOT_START_TLS,1805,"cannot start a TLS LDAP session","can not star a TLS LDAP session"
ERROR_LDAP_NOT_ONE_USER_FOUND,1806,"LDAP found zero ore more than one user","LDAP found zero ore more than one user" ERROR_LDAP_FOUND_NO_OBJECTS,1806,"LDAP didn't found any objects","LDAP didn't found any objects with the specified search query"
ERROR_LDAP_USER_NOT_IDENTIFIED,1807,"LDAP found a user, but its not the desired one","LDAP found a user, but its not the desired one" ERROR_LDAP_NOT_ONE_USER_FOUND,1807,"LDAP found zero ore more than one user","LDAP found zero ore more than one user"
ERROR_LDAP_INVALID_MODE,1810,"invalid ldap mode","cant distinguish a valid mode for provided ldap configuration" ERROR_LDAP_USER_NOT_IDENTIFIED,1808,"LDAP found a user, but its not the desired one","LDAP found a user, but its not the desired one"
ERROR_LDAP_INVALID_MODE,1820,"invalid ldap mode","cant distinguish a valid mode for provided ldap configuration"
################################################################################ ################################################################################
## Task errors ## Task errors

1
lib/Basics/voc-errors.cpp
View File

@ -215,6 +215,7 @@ void TRI_InitializeErrorMessages () {
REG_ERROR(ERROR_LDAP_CANNOT_BIND, "cannot bind to a LDAP server"); REG_ERROR(ERROR_LDAP_CANNOT_BIND, "cannot bind to a LDAP server");
REG_ERROR(ERROR_LDAP_CANNOT_UNBIND, "cannot unbind from a LDAP server"); REG_ERROR(ERROR_LDAP_CANNOT_UNBIND, "cannot unbind from a LDAP server");
REG_ERROR(ERROR_LDAP_CANNOT_SEARCH, "cannot issue a LDAP search"); REG_ERROR(ERROR_LDAP_CANNOT_SEARCH, "cannot issue a LDAP search");
REG_ERROR(ERROR_LDAP_CANNOT_START_TLS, "cannot start a TLS LDAP session");
REG_ERROR(ERROR_LDAP_FOUND_NO_OBJECTS, "LDAP didn't found any objects"); REG_ERROR(ERROR_LDAP_FOUND_NO_OBJECTS, "LDAP didn't found any objects");
REG_ERROR(ERROR_LDAP_NOT_ONE_USER_FOUND, "LDAP found zero ore more than one user"); REG_ERROR(ERROR_LDAP_NOT_ONE_USER_FOUND, "LDAP found zero ore more than one user");
REG_ERROR(ERROR_LDAP_USER_NOT_IDENTIFIED, "LDAP found a user, but its not the desired one"); REG_ERROR(ERROR_LDAP_USER_NOT_IDENTIFIED, "LDAP found a user, but its not the desired one");

56
lib/Basics/voc-errors.h
View File

@ -518,22 +518,24 @@
/// Will be raised when a service upload from the client to the ArangoDB /// Will be raised when a service upload from the client to the ArangoDB
/// server failed. /// server failed.
/// - 1800: @LIT{cannot init a LDAP connection} /// - 1800: @LIT{cannot init a LDAP connection}
/// cannot init a LDAP connection /// can not init a LDAP connection
/// - 1801: @LIT{cannot set a LDAP option} /// - 1801: @LIT{cannot set a LDAP option}
/// cannot set a LDAP option /// can not set a LDAP option
/// - 1802: @LIT{cannot bind to a LDAP server} /// - 1802: @LIT{cannot bind to a LDAP server}
/// cannot bind to a LDAP server /// can not bind to a LDAP server
/// - 1803: @LIT{cannot unbind from a LDAP server} /// - 1803: @LIT{cannot unbind from a LDAP server}
/// cannot unbind from a LDAP server /// can not unbind from a LDAP server
/// - 1804: @LIT{cannot issue a LDAP search} /// - 1804: @LIT{cannot issue a LDAP search}
/// cant search the LDAP server /// can not search the LDAP server
/// - 1805: @LIT{LDAP didn't found any objects} /// - 1805: @LIT{cannot start a TLS LDAP session}
/// can not star a TLS LDAP session
/// - 1806: @LIT{LDAP didn't found any objects}
/// LDAP didn't found any objects with the specified search query /// LDAP didn't found any objects with the specified search query
/// - 1806: @LIT{LDAP found zero ore more than one user} /// - 1807: @LIT{LDAP found zero ore more than one user}
/// LDAP found zero ore more than one user /// LDAP found zero ore more than one user
/// - 1807: @LIT{LDAP found a user, but its not the desired one} /// - 1808: @LIT{LDAP found a user, but its not the desired one}
/// LDAP found a user, but its not the desired one /// LDAP found a user, but its not the desired one
/// - 1810: @LIT{invalid ldap mode} /// - 1820: @LIT{invalid ldap mode}
/// cant distinguish a valid mode for provided ldap configuration /// cant distinguish a valid mode for provided ldap configuration
/// - 1850: @LIT{invalid task id} /// - 1850: @LIT{invalid task id}
/// Will be raised when a task is created with an invalid id. /// Will be raised when a task is created with an invalid id.
@ -2832,7 +2834,7 @@ void TRI_InitializeErrorMessages ();
/// ///
/// cannot init a LDAP connection /// cannot init a LDAP connection
/// ///
/// cannot init a LDAP connection /// can not init a LDAP connection
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
#define TRI_ERROR_LDAP_CANNOT_INIT (1800) #define TRI_ERROR_LDAP_CANNOT_INIT (1800)
@ -2842,7 +2844,7 @@ void TRI_InitializeErrorMessages ();
/// ///
/// cannot set a LDAP option /// cannot set a LDAP option
/// ///
/// cannot set a LDAP option /// can not set a LDAP option
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
#define TRI_ERROR_LDAP_CANNOT_SET_OPTION (1801) #define TRI_ERROR_LDAP_CANNOT_SET_OPTION (1801)
@ -2852,7 +2854,7 @@ void TRI_InitializeErrorMessages ();
/// ///
/// cannot bind to a LDAP server /// cannot bind to a LDAP server
/// ///
/// cannot bind to a LDAP server /// can not bind to a LDAP server
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
#define TRI_ERROR_LDAP_CANNOT_BIND (1802) #define TRI_ERROR_LDAP_CANNOT_BIND (1802)
@ -2862,7 +2864,7 @@ void TRI_InitializeErrorMessages ();
/// ///
/// cannot unbind from a LDAP server /// cannot unbind from a LDAP server
/// ///
/// cannot unbind from a LDAP server /// can not unbind from a LDAP server
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
#define TRI_ERROR_LDAP_CANNOT_UNBIND (1803) #define TRI_ERROR_LDAP_CANNOT_UNBIND (1803)
@ -2872,50 +2874,60 @@ void TRI_InitializeErrorMessages ();
/// ///
/// cannot issue a LDAP search /// cannot issue a LDAP search
/// ///
/// cant search the LDAP server /// can not search the LDAP server
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
#define TRI_ERROR_LDAP_CANNOT_SEARCH (1804) #define TRI_ERROR_LDAP_CANNOT_SEARCH (1804)
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief 1805: ERROR_LDAP_FOUND_NO_OBJECTS /// @brief 1805: ERROR_LDAP_CANNOT_START_TLS
///
/// cannot start a TLS LDAP session
///
/// can not star a TLS LDAP session
////////////////////////////////////////////////////////////////////////////////
#define TRI_ERROR_LDAP_CANNOT_START_TLS (1805)
////////////////////////////////////////////////////////////////////////////////
/// @brief 1806: ERROR_LDAP_FOUND_NO_OBJECTS
/// ///
/// LDAP didn't found any objects /// LDAP didn't found any objects
/// ///
/// LDAP didn't found any objects with the specified search query /// LDAP didn't found any objects with the specified search query
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
#define TRI_ERROR_LDAP_FOUND_NO_OBJECTS (1805) #define TRI_ERROR_LDAP_FOUND_NO_OBJECTS (1806)
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief 1806: ERROR_LDAP_NOT_ONE_USER_FOUND /// @brief 1807: ERROR_LDAP_NOT_ONE_USER_FOUND
/// ///
/// LDAP found zero ore more than one user /// LDAP found zero ore more than one user
/// ///
/// LDAP found zero ore more than one user /// LDAP found zero ore more than one user
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
#define TRI_ERROR_LDAP_NOT_ONE_USER_FOUND (1806) #define TRI_ERROR_LDAP_NOT_ONE_USER_FOUND (1807)
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief 1807: ERROR_LDAP_USER_NOT_IDENTIFIED /// @brief 1808: ERROR_LDAP_USER_NOT_IDENTIFIED
/// ///
/// LDAP found a user, but its not the desired one /// LDAP found a user, but its not the desired one
/// ///
/// LDAP found a user, but its not the desired one /// LDAP found a user, but its not the desired one
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
#define TRI_ERROR_LDAP_USER_NOT_IDENTIFIED (1807) #define TRI_ERROR_LDAP_USER_NOT_IDENTIFIED (1808)
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief 1810: ERROR_LDAP_INVALID_MODE /// @brief 1820: ERROR_LDAP_INVALID_MODE
/// ///
/// invalid ldap mode /// invalid ldap mode
/// ///
/// cant distinguish a valid mode for provided ldap configuration /// cant distinguish a valid mode for provided ldap configuration
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
#define TRI_ERROR_LDAP_INVALID_MODE (1810) #define TRI_ERROR_LDAP_INVALID_MODE (1820)
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief 1850: ERROR_TASK_INVALID_ID /// @brief 1850: ERROR_TASK_INVALID_ID