/:user/:repo.git/
- */
- private val githubRepositoryPattern = """^/[^/]+/[^/]+\.git/.*""".r
-
- override def init(filterConfig: FilterConfig) = {}
-
- override def doFilter(req: ServletRequest, res: ServletResponse, chain: FilterChain) = {
- implicit val request = req.asInstanceOf[HttpServletRequest]
- val agent = request.getHeader("USER-AGENT")
- val response = res.asInstanceOf[HttpServletResponse]
- val requestPath = request.getRequestURI.substring(request.getContextPath.length)
-
- requestPath match {
- case githubRepositoryPattern() if agent != null && agent.toLowerCase.indexOf("git") >= 0 =>
- response.sendRedirect(baseUrl + "/git" + requestPath)
- case _ =>
- chain.doFilter(req, res)
- }
- }
-
- override def destroy() = {}
-
-}
diff --git a/src/main/scala/gitbucket/core/servlet/PluginControllerFilter.scala b/src/main/scala/gitbucket/core/servlet/PluginControllerFilter.scala
index 06c6ba5..f8be024 100644
--- a/src/main/scala/gitbucket/core/servlet/PluginControllerFilter.scala
+++ b/src/main/scala/gitbucket/core/servlet/PluginControllerFilter.scala
@@ -24,7 +24,7 @@
val controller = PluginRegistry().getControllers().filter { case (_, path) =>
val requestUri = request.asInstanceOf[HttpServletRequest].getRequestURI
val start = path.replaceFirst("/\\*$", "/")
- path.endsWith("/*") && (requestUri + "/").startsWith(start)
+ (requestUri + "/").startsWith(start)
}
val filterChainWrapper = controller.foldLeft(chain){ case (chain, (controller, _)) =>
diff --git a/src/main/scala/gitbucket/core/ssh/GitCommand.scala b/src/main/scala/gitbucket/core/ssh/GitCommand.scala
index 0629c14..9d7345d 100644
--- a/src/main/scala/gitbucket/core/ssh/GitCommand.scala
+++ b/src/main/scala/gitbucket/core/ssh/GitCommand.scala
@@ -19,7 +19,7 @@
import org.eclipse.jgit.errors.RepositoryNotFoundException
object GitCommand {
- val DefaultCommandRegex = """\Agit-(upload|receive)-pack '/([a-zA-Z0-9\-_.]+)/([a-zA-Z0-9\-_.]+).git'\Z""".r
+ val DefaultCommandRegex = """\Agit-(upload|receive)-pack '/([a-zA-Z0-9\-_.]+)/([a-zA-Z0-9\-\+_.]+).git'\Z""".r
val SimpleCommandRegex = """\Agit-(upload|receive)-pack '/(.+\.git)'\Z""".r
}
diff --git a/src/main/scala/gitbucket/core/util/Notifier.scala b/src/main/scala/gitbucket/core/util/Notifier.scala
index 0c7d861..61f3c68 100644
--- a/src/main/scala/gitbucket/core/util/Notifier.scala
+++ b/src/main/scala/gitbucket/core/util/Notifier.scala
@@ -19,8 +19,12 @@
* Please see the plugin for details.
*/
trait Notifier {
+ def toNotify(subject: String, textMsg: String)
+ (recipients: Account => Session => Seq[String])(implicit context: Context): Unit = {
+ toNotify(subject, textMsg, None)(recipients)
+ }
- def toNotify(subject: String, msg: String)
+ def toNotify(subject: String, textMsg: String, htmlMsg: Option[String])
(recipients: Account => Session => Seq[String])(implicit context: Context): Unit
}
@@ -35,7 +39,7 @@
class Mailer(private val smtp: Smtp) extends Notifier {
private val logger = LoggerFactory.getLogger(classOf[Mailer])
- def toNotify(subject: String, msg: String)
+ def toNotify(subject: String, textMsg: String, htmlMsg: Option[String] = None)
(recipients: Account => Session => Seq[String])(implicit context: Context): Unit = {
context.loginAccount.foreach { loginAccount =>
val database = Database()
@@ -43,7 +47,7 @@
val f = Future {
database withSession { session =>
recipients(loginAccount)(session) foreach { to =>
- send(to, subject, msg, loginAccount)
+ send(to, subject, loginAccount, textMsg, htmlMsg)
}
}
"Notifications Successful."
@@ -55,7 +59,7 @@
}
}
- def send(to: String, subject: String, msg: String, loginAccount: Account): Unit = {
+ def send(to: String, subject: String, loginAccount: Account, textMsg: String, htmlMsg: Option[String] = None): Unit = {
val email = new HtmlEmail
email.setHostName(smtp.host)
email.setSmtpPort(smtp.port.get)
@@ -80,13 +84,16 @@
}
email.setCharset("UTF-8")
email.setSubject(subject)
- email.setHtmlMsg(msg)
+ email.setTextMsg(textMsg)
+ htmlMsg.foreach { msg =>
+ email.setHtmlMsg(msg)
+ }
email.addTo(to).send
}
}
class MockMailer extends Notifier {
- def toNotify(subject: String, msg: String)
+ def toNotify(subject: String, textMsg: String, htmlMsg: Option[String] = None)
(recipients: Account => Session => Seq[String])(implicit context: Context): Unit = ()
}
diff --git a/src/main/twirl/gitbucket/core/admin/system.scala.html b/src/main/twirl/gitbucket/core/admin/system.scala.html
index 4234243..4496e65 100644
--- a/src/main/twirl/gitbucket/core/admin/system.scala.html
+++ b/src/main/twirl/gitbucket/core/admin/system.scala.html
@@ -1,5 +1,6 @@
@(info: Option[Any])(implicit context: gitbucket.core.controller.Context)
@import gitbucket.core.util.DatabaseConfig
+@import gitbucket.core.view.helpers
@gitbucket.core.html.main("System settings"){
@gitbucket.core.admin.html.menu("system"){
@gitbucket.core.helper.html.information(info)
@@ -344,6 +345,36 @@
*@
+
+
+
+ | @st |