Skip to content
Snippets Groups Projects
Commit 11ca2fae authored by William Enright's avatar William Enright Committed by Adrien Béraud
Browse files

Restored user revocation

Change-Id: I1b2272b6c2312c3ec109304e8c706320940e7f77
parent e820cf72
No related branches found
No related tags found
No related merge requests found
...@@ -35,8 +35,10 @@ import net.jami.jams.common.dao.StatementList; ...@@ -35,8 +35,10 @@ import net.jami.jams.common.dao.StatementList;
import net.jami.jams.common.objects.user.AccessLevel; import net.jami.jams.common.objects.user.AccessLevel;
import net.jami.jams.common.objects.user.User; import net.jami.jams.common.objects.user.User;
import net.jami.jams.common.utils.PasswordGenerator; import net.jami.jams.common.utils.PasswordGenerator;
import org.bouncycastle.openssl.PEMWriter;
import java.io.IOException; import java.io.IOException;
import java.io.StringWriter;
import static net.jami.jams.server.Server.certificateAuthority; import static net.jami.jams.server.Server.certificateAuthority;
import static net.jami.jams.server.Server.dataStore; import static net.jami.jams.server.Server.dataStore;
...@@ -45,7 +47,7 @@ import static net.jami.jams.server.Server.nameServer; ...@@ -45,7 +47,7 @@ import static net.jami.jams.server.Server.nameServer;
@WebServlet("/api/auth/user") @WebServlet("/api/auth/user")
public class UserServlet extends HttpServlet { public class UserServlet extends HttpServlet {
//User can "read" his own profile. //User can "read" himself.
/** /**
* @apiVersion 1.0.0 * @apiVersion 1.0.0
* @api {get} /api/auth/user Get JAMS user info * @api {get} /api/auth/user Get JAMS user info
...@@ -94,6 +96,12 @@ public class UserServlet extends HttpServlet { ...@@ -94,6 +96,12 @@ public class UserServlet extends HttpServlet {
resp.setHeader("needspasswordreset", (user.getNeedsPasswordReset()).toString()); resp.setHeader("needspasswordreset", (user.getNeedsPasswordReset()).toString());
resp.setHeader("password", password); resp.setHeader("password", password);
if (certificateAuthority.getLatestCRL().get()
.getRevokedCertificate(user.getCertificate().getSerialNumber()) == null)
resp.setHeader("revoked", "false");
else
resp.setHeader("revoked", "true");
} }
//The user can update 3 fields: password,privatekey,publickey //The user can update 3 fields: password,privatekey,publickey
......
...@@ -46,10 +46,13 @@ var api_path_get_directories = '/api/auth/directories'; ...@@ -46,10 +46,13 @@ var api_path_get_directories = '/api/auth/directories';
var api_path_get_needs_update = '/api/admin/update'; var api_path_get_needs_update = '/api/admin/update';
var api_path_get_start_update = '/api/admin/update'; var api_path_get_start_update = '/api/admin/update';
var api_path_post_create_user = '/api/admin/user'; var api_path_post_create_user = '/api/admin/user';
var api_path_get_user = '/api/auth/user';
var api_path_post_update_user = '/api/auth/user'; var api_path_post_update_user = '/api/auth/user';
var api_path_get_exists_user = '/api/admin/user'; var api_path_get_exists_user = '/api/admin/user';
var api_path_get_user_directory_search ='/api/auth/directory/search'; var api_path_get_user_directory_search ='/api/auth/directory/search';
var api_path_post_create_user_profile = '/api/admin/directory/entry'; var api_path_post_create_user_profile = '/api/admin/directory/entry';
var api_path_put_update_user_profile = '/api/admin/directory/entry';
var api_path_get_user_search = '/api/admin/users';
function ajaxApiCall(api_path, request_type, data, credentials, callBackFunction, async) { function ajaxApiCall(api_path, request_type, data, credentials, callBackFunction, async) {
// build AJAX call // build AJAX call
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment