Skip to content

Commit

Permalink
more cleanup, minor frontend fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
delorean committed Jan 16, 2024
1 parent 09fab10 commit 1b1553c
Show file tree
Hide file tree
Showing 2 changed files with 229 additions and 134 deletions.
13 changes: 6 additions & 7 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -215,33 +215,32 @@ func main() {
log.Logger = log.Output(zerolog.ConsoleWriter{Out: os.Stderr})
LoadConf()

var err error
if !Exists(conf.FileFolder) {
if err := os.Mkdir(conf.FileFolder, 0755); err != nil {
if err = os.Mkdir(conf.FileFolder, 0755); err != nil {
log.Fatal().Err(err).Msg("unable to create folder")
}
}
if !Exists(conf.DBFile) {
if _, err := os.Create(conf.DBFile); err != nil {
if _, err = os.Create(conf.DBFile); err != nil {
log.Fatal().Err(err).Msg("unable to create database file")
}
}

if err := landlock.V2.BestEffort().RestrictPaths(
if err = landlock.V2.BestEffort().RestrictPaths(
landlock.RWDirs(conf.FileFolder),
landlock.RWDirs(conf.Webroot),
landlock.RWFiles(conf.DBFile),
); err != nil {
log.Warn().Err(err).Msg("could not landlock")
}

if _, err := os.Open("/etc/passwd"); err != nil {
if _, err = os.Open("/etc/passwd"); err == nil {
log.Warn().Msg("landlock failed, could open /etc/passwd, are you on a 5.13+ kernel?")
} else {
log.Info().Err(err).Msg("landlocked")
}

db, err := bolt.Open(conf.DBFile, 0600, nil)
if err != nil {
if db, err = bolt.Open(conf.DBFile, 0600, nil); err != nil {
log.Fatal().Err(err).Msg("unable to open database file")
}
db.Update(func(tx *bolt.Tx) error {
Expand Down
Loading

0 comments on commit 1b1553c

Please sign in to comment.