Revision 5071
Added by daigle over 14 years ago
| MetaCatServlet.java | ||
|---|---|---|
| 932 | 932 |
PrintWriter out = response.getWriter(); |
| 933 | 933 |
handleGetAccessControlAction(out, params, response, userName, groupNames); |
| 934 | 934 |
out.close(); |
| 935 |
} else if (action.equals("isauthorized")) {
|
|
| 936 |
PrintWriter out = response.getWriter(); |
|
| 937 |
DocumentUtil.isAuthorized(out, params, request, response); |
|
| 938 |
out.close(); |
|
| 935 | 939 |
} else if (action.equals("getprincipals")) {
|
| 936 | 940 |
PrintWriter out = response.getWriter(); |
| 937 | 941 |
handleGetPrincipalsAction(out, userName, password); |
| ... | ... | |
| 1081 | 1085 |
PrintWriter out = response.getWriter(); |
| 1082 | 1086 |
out.println("<?xml version=\"1.0\"?>");
|
| 1083 | 1087 |
out.println("<error>");
|
| 1084 |
out.println("Error: action not registered. Please report this error.");
|
|
| 1088 |
out.println("Error: action: " + action + " not registered. Please report this error.");
|
|
| 1085 | 1089 |
out.println("</error>");
|
| 1086 | 1090 |
out.close(); |
| 1087 | 1091 |
} |
| ... | ... | |
| 1325 | 1329 |
String pw = (params.get("password"))[0];
|
| 1326 | 1330 |
|
| 1327 | 1331 |
String qformat = "xml"; |
| 1328 |
if(params.get("qformat") != null){
|
|
| 1332 |
if (params.get("qformat") != null) {
|
|
| 1329 | 1333 |
qformat = (params.get("qformat"))[0];
|
| 1330 | 1334 |
} |
| 1331 | 1335 |
|
| ... | ... | |
| 1344 | 1348 |
if (isValid) {
|
| 1345 | 1349 |
HttpSession session = sess.getSessions(); |
| 1346 | 1350 |
String id = session.getId(); |
| 1351 |
|
|
| 1347 | 1352 |
logMetacat.debug("Store session id " + id
|
| 1348 | 1353 |
+ " which has username" + session.getAttribute("username")
|
| 1349 | 1354 |
+ " into hash in login method"); |
| 1350 | 1355 |
try {
|
| 1351 |
SessionService.registerSession(id, (String) session |
|
| 1352 |
.getAttribute("username"), (String[]) session
|
|
| 1353 |
.getAttribute("groupnames"), (String) session
|
|
| 1354 |
.getAttribute("password"));
|
|
| 1356 |
SessionService.registerSession(id, |
|
| 1357 |
(String) session.getAttribute("username"),
|
|
| 1358 |
(String[]) session.getAttribute("groupnames"),
|
|
| 1359 |
(String) session.getAttribute("password"),
|
|
| 1360 |
(String) session.getAttribute("name"));
|
|
| 1355 | 1361 |
} catch (ServiceException se) {
|
| 1356 | 1362 |
String errorMsg = "MetacatServlet.handleLoginAction()- service problem registering session: " |
| 1357 | 1363 |
+ se.getMessage(); |
| 1358 | 1364 |
logMetacat.error(errorMsg); |
| 1359 | 1365 |
out.println(errorMsg); |
| 1360 | 1366 |
return; |
| 1361 |
} |
|
| 1362 |
// catch (PropertyNotFoundException pnfe) {
|
|
| 1363 |
// String errorMsg = "MetacatServlet.handleLoginAction() - problem getting application context: " |
|
| 1364 |
// + pnfe.getMessage(); |
|
| 1365 |
// logMetacat.error(errorMsg); |
|
| 1366 |
// out.println(errorMsg); |
|
| 1367 |
// return; |
|
| 1368 |
// } |
|
| 1369 |
|
|
| 1367 |
} |
|
| 1370 | 1368 |
} |
| 1371 |
|
|
| 1369 |
|
|
| 1372 | 1370 |
// format and transform the output |
| 1373 | 1371 |
if (qformat.equals("xml")) {
|
| 1374 | 1372 |
response.setContentType("text/xml");
|
Also available in: Unified diff
Change sanparks skin to log in with browser session instead of metacat client session so session can be validated on other pages.