Include files relative to parent (fixes #11)

Signed-off-by: Christian Blichmann <mail@blichmann.eu>

debian/changelog

@@ -2,6 +2,7 @@ jailtime (0.7-1) unstable; urgency=medium
 
  * New --dry-run option to print actions only
  * Put run statements last, do not sort them
+ * Fix: Include files relative to their parent
 
  -- Christian Blichmann (Secure Email 2018/2019) <mail@blichmann.eu> Mon, 26 Nov 2018 23:24:34 +0100
 

jailtime.go

@@ -31,7 +31,7 @@ import (
  "flag"
  "fmt"
  "os"
- "path"
+ "path/filepath"
 
  "blichmann.eu/code/jailtime/action"
  "blichmann.eu/code/jailtime/copy"
@@ -149,7 +149,7 @@ func updateChroot(chrootDir string, stmts spec.Statements) (err error) {
  reflinkOpt = copy.ReflinkAlways
  }
  for _, s := range spec.ExpandLexical(expandWithDependencies(stmts)) {
- target := path.Join(chrootDir, s.Target())
+ target := filepath.Join(chrootDir, s.Target())
  if *verbose {
  fmt.Println(s.Verbose())
  if *dryRun {

spec/expand.go

@@ -28,7 +28,7 @@
 package spec // import "blichmann.eu/code/jailtime/spec"
 
 import (
- "path"
+ "path/filepath"
  "sort"
 )
 
@@ -57,7 +57,7 @@ func ExpandLexical(stmts Statements) Statements {
  done[target] = true
  if dir != target {
  expanded = append(expanded, s)
- dir = path.Dir(target)
+ dir = filepath.Dir(target)
  }
  for dirLen := 0; dirLen != len(dir) && dir != "/"; {
  if _, ok := done[dir]; !ok {
@@ -72,7 +72,7 @@ func ExpandLexical(stmts Statements) Statements {
  done[dir] = true
  }
  dirLen = len(dir)
- dir = path.Dir(dir)
+ dir = filepath.Dir(dir)
  }
  }
  sort.Stable(expanded)

spec/parser.go

@@ -31,6 +31,7 @@ import (
  "bufio"
  "fmt"
  "os"
+ "path/filepath"
  "regexp"
  "strconv"
  "strings"
@@ -179,6 +180,15 @@ func parseFromFile(filename string, includeDepth int) (stmts Statements,
  return
  }
 
+ fromDir, err := filepath.EvalSymlinks(filename)
+ if err != nil {
+ return
+ }
+ if fromDir, err = filepath.Abs(fromDir); err != nil {
+ return
+ }
+ fromDir = filepath.Dir(fromDir)
+
  f, err := os.Open(filename)
  if err != nil {
  return
@@ -194,7 +204,8 @@ func parseFromFile(filename string, includeDepth int) (stmts Statements,
  line = s.Text()
  lineStmts, err = parseSpecLine(filename, lineNo, line,
  func(filename string) (Statements, error) {
- return parseFromFile(filename, includeDepth+1)
+ return parseFromFile(filepath.Join(fromDir, filename),
+ includeDepth+1)
  })
  if err != nil {
  return