Skip to content

Commit

Permalink
Merge pull request #110 from kardapoltsev/wip/bad-permissions
Browse files Browse the repository at this point in the history 
fixed bad permissions for debian maintainer scripts
  • Loading branch information
@jsuereth
jsuereth committed Dec 19, 2013
2 parents 4a457cf + bfa8e0a commit 1174ad3
Show file tree
Hide file tree
Showing 2 changed files with 50 additions and 19 deletions.
6 changes: 3 additions & 3 deletions src/main/scala/com/typesafe/sbt/packager/archetypes/JavaServerApplication.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ object JavaServerAppPackaging {
debianMakeEtcDefault <<= (normalizedName, target in Universal, serverLoading in Debian)
map makeEtcDefaultScript,
linuxPackageMappings in Debian <++= (debianMakeEtcDefault, normalizedName) map { (conf, name) =>
conf.map(c => LinuxPackageMapping(Seq(c -> s"/etc/default/$name")).withConfig()).toSeq
conf.map(c => LinuxPackageMapping(Seq(c -> ("/etc/default/" + name))).withConfig()).toSeq
},
linuxPackageMappings in Debian <++= (debianMakeStartScript, normalizedName, serverLoading in Debian)
map { (script, name, loader) =>
Expand Down Expand Up @@ -82,7 +82,7 @@ object JavaServerAppPackaging {
if (replacements.isEmpty) None
else {
val scriptBits = JavaAppStartScript.generateScript(replacements, loader)
val script = tmpDir / "tmp" / "bin" / s"$name.$loader"
val script = tmpDir / "tmp" / "init" / name
IO.write(script, scriptBits)
Some(script)
}
Expand All @@ -106,7 +106,7 @@ object JavaServerAppPackaging {
case Upstart => None
case SystemV => {
val scriptBits = TemplateWriter.generateScript(etcDefaultTemplateSource, Seq.empty)
val script = tmpDir / "tmp" / "bin" / "etc-default"
val script = tmpDir / "tmp" / "etc" / "default" / name
IO.write(script, scriptBits)
Some(script)
}
Expand Down
63 changes: 47 additions & 16 deletions src/main/scala/com/typesafe/sbt/packager/debian/DebianPlugin.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ trait DebianPlugin extends Plugin with linux.LinuxPlugin {
val Debian = config("debian") extend Linux

import com.typesafe.sbt.packager.universal.Archives
import DebianPlugin.Names

private[this] final def copyAndFixPerms(from: File, to: File, perms: LinuxFileMetaData, zipped: Boolean = false): Unit = {
if (zipped) {
Expand All @@ -39,6 +40,15 @@ trait DebianPlugin extends Plugin with linux.LinuxPlugin {
script
}


private[this] def prependAndFixPerms(script: File, lines: Seq[String], perms: LinuxFileMetaData): File = {
val old = IO.readLines(script)
IO.writeLines(script, lines ++ old, append = false)
chmod(script, perms.permissions)
script
}


private[this] def scriptMapping(scriptName: String)(script: Option[File], controlDir: File): Seq[(File, String)] = {
(script, controlDir) match {
// check if user defined script exists
Expand Down Expand Up @@ -67,17 +77,17 @@ trait DebianPlugin extends Plugin with linux.LinuxPlugin {
// Debian Control Scripts
debianControlScriptsReplacements <<= (maintainer in Debian, packageSummary in Debian, normalizedName, version) apply DebianControlScriptReplacements,

debianControlScriptsDirectory <<= (sourceDirectory) apply (_ / "debian" / "DEBIAN"),
debianControlScriptsDirectory <<= (sourceDirectory) apply (_ / "debian" / Names.Debian),
debianMaintainerScripts := Seq.empty,
debianMakePreinstScript := None,
debianMakePrermScript := None,
debianMakePostinstScript := None,
debianMakePostrmScript := None,

debianMaintainerScripts <++= (debianMakePrermScript, debianControlScriptsDirectory) map scriptMapping("prerm"),
debianMaintainerScripts <++= (debianMakePreinstScript, debianControlScriptsDirectory) map scriptMapping("preinst"),
debianMaintainerScripts <++= (debianMakePostinstScript, debianControlScriptsDirectory) map scriptMapping("postinst"),
debianMaintainerScripts <++= (debianMakePostrmScript, debianControlScriptsDirectory) map scriptMapping("postrm")) ++ inConfig(Debian)(Seq(
debianMaintainerScripts <++= (debianMakePrermScript, debianControlScriptsDirectory) map scriptMapping(Names.Prerm),
debianMaintainerScripts <++= (debianMakePreinstScript, debianControlScriptsDirectory) map scriptMapping(Names.Preinst),
debianMaintainerScripts <++= (debianMakePostinstScript, debianControlScriptsDirectory) map scriptMapping(Names.Postinst),
debianMaintainerScripts <++= (debianMakePostrmScript, debianControlScriptsDirectory) map scriptMapping(Names.Postrm)) ++ inConfig(Debian)(Seq(
packageArchitecture := "all",
debianPackageInfo <<=
(name, version, maintainer, packageSummary, packageDescription) apply PackageInfo,
Expand All @@ -95,14 +105,14 @@ trait DebianPlugin extends Plugin with linux.LinuxPlugin {
},
debianControlFile <<= (debianPackageMetadata, debianPackageInstallSize, target) map {
(data, size, dir) =>
val cfile = dir / "DEBIAN" / "control"
val cfile = dir / Names.Debian / Names.Control
IO.write(cfile, data.makeContent(size), java.nio.charset.Charset.defaultCharset)
chmod(cfile, "0644")
cfile
},
debianConffilesFile <<= (linuxPackageMappings, target) map {
(mappings, dir) =>
val cfile = dir / "DEBIAN" / "conffiles"
val cfile = dir / Names.Debian / Names.Conffiles
val conffiles = for {
LinuxPackageMapping(files, meta, _) <- mappings
if meta.config != "false"
Expand Down Expand Up @@ -139,7 +149,7 @@ trait DebianPlugin extends Plugin with linux.LinuxPlugin {
// Put the maintainer files in `dir / "DEBIAN"` named as specified.
// Valid values for the name are preinst,postinst,prerm,postrm
for ((file, name) <- maintScripts) {
val targetFile = t / "DEBIAN" / name
val targetFile = t / Names.Debian / name
copyAndFixPerms(file, targetFile, LinuxFileMetaData())
filterAndFixPerms(targetFile, replacements, LinuxFileMetaData())
}
Expand All @@ -154,31 +164,38 @@ trait DebianPlugin extends Plugin with linux.LinuxPlugin {
} groupBy (_._1) foreach {
case ((user, group), pathList) =>
streams.log info ("Altering postrm/postinst files to add user " + user + " and group " + group)
val postinst = t / "DEBIAN" / "postinst"
val postrm = t / "DEBIAN" / "postrm"
val postinst = t / Names.Debian / Names.Postinst
val postrm = t / Names.Debian / Names.Postrm

val replacements = Seq("group" -> group, "user" -> user)
IO.append(postinst, TemplateWriter.generateScript(DebianPlugin.postinstGroupaddTemplateSource, replacements))
IO.append(postinst, TemplateWriter.generateScript(DebianPlugin.postinstUseraddTemplateSource, replacements))

val userGroupAdd = Seq(
TemplateWriter.generateScript(DebianPlugin.postinstGroupaddTemplateSource, replacements),
TemplateWriter.generateScript(DebianPlugin.postinstUseraddTemplateSource, replacements)
)

prependAndFixPerms(postinst, userGroupAdd, LinuxFileMetaData())

// remove key, flatten it and then go through each file
pathList.map(_._2).flatten foreach {
case (_, target) =>
val pathReplacements = replacements :+ ("path" -> target.toString)
IO.append(postinst, TemplateWriter.generateScript(DebianPlugin.postinstChownTemplateSource, pathReplacements))
val chownAdd = Seq(TemplateWriter.generateScript(DebianPlugin.postinstChownTemplateSource, pathReplacements))
prependAndFixPerms(postinst, chownAdd, LinuxFileMetaData())
}

IO.append(postrm, TemplateWriter.generateScript(DebianPlugin.postrmPurgeTemplateSource, replacements))
val purgeAdd = Seq(TemplateWriter.generateScript(DebianPlugin.postrmPurgeTemplateSource, replacements))
prependAndFixPerms(postrm, purgeAdd, LinuxFileMetaData())
}
t
},
debianMD5sumsFile <<= (debianExplodedPackage, target) map {
(mappings, dir) =>
val md5file = dir / "DEBIAN" / "md5sums"
val md5file = dir / Names.Debian / "md5sums"
val md5sums = for {
(file, name) <- (dir.*** --- dir x relativeTo(dir))
if file.isFile
if !(name startsWith "DEBIAN")
if !(name startsWith Names.Debian)
if !(name contains "debian-binary")
// TODO - detect symlinks with Java7 (when we can) rather than hackery...
if file.getCanonicalPath == file.getAbsolutePath
Expand Down Expand Up @@ -210,6 +227,20 @@ trait DebianPlugin extends Plugin with linux.LinuxPlugin {
}

object DebianPlugin {
object Names {
val Debian = "DEBIAN"

//maintainer script names
val Postinst = "postinst"
val Postrm = "postrm"
val Prerm = "prerm"
val Preinst = "preinst"

val Control = "control"
val Conffiles = "conffiles"
}


private def postinstGroupaddTemplateSource: java.net.URL = getClass.getResource("postinst-groupadd")
private def postinstUseraddTemplateSource: java.net.URL = getClass.getResource("postinst-useradd")
private def postinstChownTemplateSource: java.net.URL = getClass.getResource("postinst-chown")
Expand Down

0 comments on commit 1174ad3

Please sign in to comment.