Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-12-29 11:49:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash while updating avatar with svg (#2318)

Browse Source
This commit is contained in:
Joobi S B
2019-05-31 20:59:01 +05:30
committed by Naoki Takezoe
parent 13e6f5f6cf
commit f7defffeab
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/scala/gitbucket/core/controller/ControllerBase.scala
View File

@@ -324,6 +324,8 @@ case class Context(
trait AccountManagementControllerBase extends ControllerBase {
self: AccountService =>
private val logger = LoggerFactory.getLogger(getClass)
protected def updateImage(userName: String, fileId: Option[String], clearImage: Boolean): Unit =
if (clearImage) {
getAccountByUserName(userName).flatMap(_.image).foreach { image =>
@@ -331,17 +333,21 @@ trait AccountManagementControllerBase extends ControllerBase {
updateAvatarImage(userName, None)
}
} else {
fileId.foreach { fileId =>
val filename = "avatar." + FileUtil.getExtension(session.getAndRemove(Keys.Session.Upload(fileId)).get)
val uploadDir = getUserUploadDir(userName)
if (!uploadDir.exists) {
uploadDir.mkdirs()
try {
fileId.foreach { fileId =>
val filename = "avatar." + FileUtil.getExtension(session.getAndRemove(Keys.Session.Upload(fileId)).get)
val uploadDir = getUserUploadDir(userName)
if (!uploadDir.exists) {
uploadDir.mkdirs()
}
Thumbnails
.of(new File(getTemporaryDir(session.getId), FileUtil.checkFilename(fileId)))
.size(324, 324)
.toFile(new File(uploadDir, FileUtil.checkFilename(filename)))
updateAvatarImage(userName, Some(filename))
}
Thumbnails
.of(new File(getTemporaryDir(session.getId), FileUtil.checkFilename(fileId)))
.size(324, 324)
.toFile(new File(uploadDir, FileUtil.checkFilename(filename)))
updateAvatarImage(userName, Some(filename))
} catch {
case e: Exception => logger.info("Error while updateImage" + e.getMessage)
}
}