test (a41fdb76) · Commits · tuxist / authdb

src/admin.cpp

+16 −16

Original line number	Diff line number	Diff line
		@@ -145,7 +145,7 @@ namespace authdb {
		void apiListUsers(libhttppp::HttpRequest &curreq, const char *cdid) {
		AuthBackend *backend = getDomain(cdid);
		if (!backend) throw AuthBackendError("listUsers: could not resolve domain!");
		AuthBackend::Guard guard(*backend);
		AuthBackend::Guard guard(*backend, AuthBackend::Shared);

		json_object *jobj = json_object_new_object();
		json_object *jarr = json_object_new_array();
		@@ -190,7 +190,7 @@ namespace authdb {
		void apiGetUser(libhttppp::HttpRequest &curreq, const char cdid, const char cuid) {
		AuthBackend *backend = getDomain(cdid);
		if (!backend) throw AuthBackendError("getUser: could not resolve domain!");
		AuthBackend::Guard guard(*backend);
		AuthBackend::Guard guard(*backend, AuthBackend::Shared);

		uuid::uuid uid;
		uid.parse(cuid);
		@@ -507,7 +507,7 @@ namespace authdb {
		if (!sdat) return false;

		// Refresh admin backend data from cluster (RAII: lock + unlock)
		AuthBackend::Guard guard(_AdminBackend);
		AuthBackend::Guard guard(_AdminBackend, AuthBackend::Shared);

		// Get the user ID from the session
		uuid::uuid uid;
		@@ -686,7 +686,7 @@ namespace authdb {

		/* ---- JSON API: List Domains ---- */
		void apiListDomains(libhttppp::HttpRequest &curreq) {
		AuthBackend::Guard guard(_AdminBackend);
		AuthBackend::Guard guard(_AdminBackend, AuthBackend::Shared);
		json_object *jobj = json_object_new_object();
		json_object *jarr = json_object_new_array();

		@@ -884,7 +884,7 @@ namespace authdb {
		void apiListGroups(libhttppp::HttpRequest &curreq, const char *cdid) {
		AuthBackend *backend = getDomain(cdid);
		if (!backend) throw AuthBackendError("listGroups: could not resolve domain!");
		AuthBackend::Guard guard(*backend);
		AuthBackend::Guard guard(*backend, AuthBackend::Shared);

		json_object *jobj = json_object_new_object();
		json_object *jarr = json_object_new_array();
		@@ -924,7 +924,7 @@ namespace authdb {
		void apiGetGroup(libhttppp::HttpRequest &curreq, const char cdid, const char cgid) {
		AuthBackend *backend = getDomain(cdid);
		if (!backend) throw AuthBackendError("getGroup: could not resolve domain!");
		AuthBackend::Guard guard(*backend);
		AuthBackend::Guard guard(*backend, AuthBackend::Shared);

		uuid::uuid gid(cgid);
		json_object *jobj = json_object_new_object();
		@@ -1119,7 +1119,7 @@ namespace authdb {

		AuthBackend *backend = getDomain(cdid);
		if (!backend) throw AuthBackendError("reloadSession: could not resolve domain!");
		AuthBackend::Guard guard(*backend);
		AuthBackend::Guard guard(*backend, AuthBackend::Shared);

		AuthSession->relSession(*backend, sid);

		@@ -1133,7 +1133,7 @@ namespace authdb {
		void apiListGpos(libhttppp::HttpRequest &curreq, const char *cdid) {
		AuthBackend *backend = getDomain(cdid);
		if (!backend) throw AuthBackendError("listGpos: could not resolve domain!");
		AuthBackend::Guard guard(*backend);
		AuthBackend::Guard guard(*backend, AuthBackend::Shared);

		json_object *jobj = json_object_new_object();
		json_object *jarr = json_object_new_array();
		@@ -1180,7 +1180,7 @@ namespace authdb {
		void apiGetGpo(libhttppp::HttpRequest &curreq, const char cdid, const char cgpid) {
		AuthBackend *backend = getDomain(cdid);
		if (!backend) throw AuthBackendError("getGpo: could not resolve domain!");
		AuthBackend::Guard guard(*backend);
		AuthBackend::Guard guard(*backend, AuthBackend::Shared);

		uuid::uuid gpid;
		gpid.parse(cgpid);
		@@ -1359,7 +1359,7 @@ namespace authdb {
		void apiListServices(libhttppp::HttpRequest &curreq, const char *cdid) {
		AuthBackend *backend = getDomain(cdid);
		if (!backend) throw AuthBackendError("listServices: could not resolve domain!");
		AuthBackend::Guard guard(*backend);
		AuthBackend::Guard guard(*backend, AuthBackend::Shared);

		json_object *jobj = json_object_new_object();
		json_object *jarr = json_object_new_array();
		@@ -1410,7 +1410,7 @@ namespace authdb {
		void apiGetService(libhttppp::HttpRequest &curreq, const char cdid, const char csid) {
		AuthBackend *backend = getDomain(cdid);
		if (!backend) throw AuthBackendError("getService: could not resolve domain!");
		AuthBackend::Guard guard(*backend);
		AuthBackend::Guard guard(*backend, AuthBackend::Shared);

		uuid::uuid sid;
		if (sid.parse(csid) != 0)
		@@ -1621,7 +1621,7 @@ namespace authdb {
		void apiListClients(libhttppp::HttpRequest &curreq, const char *cdid) {
		AuthBackend *backend = getDomain(cdid);
		if (!backend) throw AuthBackendError("listClients: could not resolve domain!");
		AuthBackend::Guard guard(*backend);
		AuthBackend::Guard guard(*backend, AuthBackend::Shared);

		json_object *jobj = json_object_new_object();
		json_object *jarr = json_object_new_array();
		@@ -1662,7 +1662,7 @@ namespace authdb {
		void apiGetClient(libhttppp::HttpRequest &curreq, const char cdid, const char cclid) {
		AuthBackend *backend = getDomain(cdid);
		if (!backend) throw AuthBackendError("getClient: could not resolve domain!");
		AuthBackend::Guard guard(*backend);
		AuthBackend::Guard guard(*backend, AuthBackend::Shared);

		uuid::uuid clid;
		if (clid.parse(cclid) != 0)
		@@ -1810,7 +1810,7 @@ namespace authdb {
		void apiExportDb(libhttppp::HttpRequest &curreq, const char *cdid) {
		AuthBackend *backend = getDomain(cdid);
		if (!backend) throw AuthBackendError("export: could not resolve domain!");
		AuthBackend::Guard guard(*backend);
		AuthBackend::Guard guard(*backend, AuthBackend::Shared);

		json_object jobj = Export::toJson(backend);
		sendJson(curreq, jobj);
		@@ -1917,7 +1917,7 @@ namespace authdb {
		}

		// Lock backend to fetch latest data from cluster before reading
		AuthBackend::Guard guard(*backend);
		AuthBackend::Guard guard(*backend, AuthBackend::Shared);

		User user;
		size_t rd = sizeof(authdb::AuthHeader), end = backend->end();
		@@ -2026,7 +2026,7 @@ namespace authdb {
		libhtmlpp::HtmlElement index = _LoginElement, domel = index.getElementbyID("domain");
		libhtmlpp::HtmlElement *loginel = index.getElementbyID("login");

		AuthBackend::Guard domguard(_AdminBackend);
		AuthBackend::Guard domguard(_AdminBackend, AuthBackend::Shared);
		Domain domain;
		size_t rd = sizeof(authdb::AuthHeader), end = _AdminBackend.end();

src/admin.cpp.bak

0 → 100644

+2258 −0

File added.

Preview size limit exceeded, changes collapsed.

src/authdb.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -438,7 +438,7 @@ namespace authdb {
		::uuid::uuid uid(cuid);

		// Always lock the resolved backend
		AuthBackend::Guard domlock(*backend);
		AuthBackend::Guard domlock(*backend, AuthBackend::Shared);

		size_t rd=sizeof(authdb::AuthHeader),end=backend->end();

		@@ -483,7 +483,7 @@ namespace authdb {
		DomainBackend db(_AdminBackend);
		DomainInfo dinfo;
		{
		AuthBackend::Guard admlock(_AdminBackend);
		AuthBackend::Guard admlock(_AdminBackend, AuthBackend::Shared);
		dinfo = db.resolve(did.value);
		}
		if(!dinfo.found)

src/authdb.cpp.bak

0 → 100644

+818 −0

File added.

Preview size limit exceeded, changes collapsed.