Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-10 15:35:49 +01:00
Code Issues Packages Projects Releases Activity

use basic authorization header for mercurial hook authentication

Browse Source
This commit is contained in:
Sebastian Sdorra
2015-03-21 15:56:51 +01:00
parent b2e1c1e1f8
commit debcacb61f
1 changed files with 33 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgEnvironment.java
View File

@@ -30,16 +30,20 @@
*/ */
package sonia.scm.repository; package sonia.scm.repository;
//~--- non-JDK imports -------------------------------------------------------- //~--- non-JDK imports --------------------------------------------------------
import com.google.common.base.Strings; import com.google.common.base.Strings;
import org.apache.shiro.SecurityUtils; import org.apache.shiro.codec.Base64;
import org.apache.shiro.session.Session;
import org.apache.shiro.subject.Subject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import sonia.scm.security.CipherUtil;
import sonia.scm.util.HttpUtil;
import sonia.scm.web.HgUtil; import sonia.scm.web.HgUtil;
//~--- JDK imports ------------------------------------------------------------ //~--- JDK imports ------------------------------------------------------------
@@ -67,6 +71,12 @@ public final class HgEnvironment
/** Field description */ /** Field description */
private static final String SCM_CREDENTIALS = "SCM_CREDENTIALS"; private static final String SCM_CREDENTIALS = "SCM_CREDENTIALS";
/**
* the logger for HgEnvironment
*/
private static final Logger logger =
LoggerFactory.getLogger(HgEnvironment.class);
//~--- constructors --------------------------------------------------------- //~--- constructors ---------------------------------------------------------
/** /**
@@ -95,6 +105,7 @@ public final class HgEnvironment
if (request != null) if (request != null)
{ {
hookUrl = hookManager.createUrl(request); hookUrl = hookManager.createUrl(request);
environment.put(SCM_CREDENTIALS, getCredentials(request));
} }
else else
{ {
@@ -104,7 +115,6 @@ public final class HgEnvironment
environment.put(ENV_PYTHON_PATH, HgUtil.getPythonPath(handler.getConfig())); environment.put(ENV_PYTHON_PATH, HgUtil.getPythonPath(handler.getConfig()));
environment.put(ENV_URL, hookUrl); environment.put(ENV_URL, hookUrl);
environment.put(ENV_CHALLENGE, hookManager.getChallenge()); environment.put(ENV_CHALLENGE, hookManager.getChallenge());
environment.put(SCM_CREDENTIALS, getCredentials());
} }
/** /**
@@ -129,16 +139,29 @@ public final class HgEnvironment
* *
* @return * @return
*/ */
private static String getCredentials() private static String getCredentials(HttpServletRequest request)
{ {
String credentials = null; String credentials = null;
String header = request.getHeader(HttpUtil.HEADER_AUTHORIZATION);
Subject subject = SecurityUtils.getSubject(); if (!Strings.isNullOrEmpty(header))
Session session = subject.getSession(false);
if (session != null)
{ {
credentials = (String) session.getAttribute(SCM_CREDENTIALS); String[] parts = header.split("\\s+");
if (parts.length > 0)
{
CipherUtil cu = CipherUtil.getInstance();
credentials = cu.encode(Base64.decodeToString(parts[1]));
}
else
{
logger.warn("invalid basic authentication header");
}
}
else
{
logger.warn("could not find authentication header on request");
} }
return Strings.nullToEmpty(credentials); return Strings.nullToEmpty(credentials);