fix error handling

api/auth.go

@@ -71,6 +71,9 @@ func AuthValidateOnetimeKey(c *fiber.Ctx, key string, db *Db) (bool, error) {
 	}
 
 	sess, err := Sessionstore.Get(c)
+	if err != nil {
+		return false, errors.New("Could not retrieve session from Sessionstore: " + err.Error())
+	}
 
 	// store the  result into the session, the 'formid'  key tells the
 	// upload handler that the apicontext it sees is in fact a form id

api/cleaner.go

@@ -58,10 +58,6 @@ func DeleteExpiredUploads(conf *cfg.Config, db *Db) error {
 		return err
 	})
 
-	if err != nil {
-		Log("DB error: %s", err.Error())
-	}
-
 	return err
 }
 
@@ -74,7 +70,9 @@ func BackgroundCleaner(conf *cfg.Config, db *Db) chan bool {
 		for {
 			select {
 			case <-ticker.C:
-				DeleteExpiredUploads(conf, db)
+				if err := DeleteExpiredUploads(conf, db); err != nil {
+					Log("Failed to delete eypired uploads: %s", err.Error())
+				}
 			case <-done:
 				ticker.Stop()
 				return

api/db_test.go

@@ -112,6 +112,10 @@ func TestDboperation(t *testing.T) {
 			if tt.upload.Id != "" {
 				// set ts
 				ts, err := time.Parse(timeformat, tt.ts)
+				if err != nil {
+					t.Errorf("Could not parse time: " + err.Error())
+				}
+
 				tt.upload.Created = common.Timestamp{Time: ts}
 
 				// create new upload db object
@@ -162,7 +166,7 @@ func TestDboperation(t *testing.T) {
 				}
 
 				// fetch again, shall return empty
-				response, err = db.Get(tt.context, tt.id, common.TypeUpload)
+				_, err = db.Get(tt.context, tt.id, common.TypeUpload)
 				if err == nil {
 					t.Errorf("Could fetch upload object again although we deleted it")
 				}
@@ -171,6 +175,9 @@ func TestDboperation(t *testing.T) {
 			if tt.form.Id != "" {
 				// set ts
 				ts, err := time.Parse(timeformat, tt.ts)
+				if err != nil {
+					t.Errorf("Could not parse time: " + err.Error())
+				}
 				tt.form.Created = common.Timestamp{Time: ts}
 
 				// create new form db object
@@ -221,7 +228,7 @@ func TestDboperation(t *testing.T) {
 				}
 
 				// fetch again, shall return empty
-				response, err = db.Get(tt.context, tt.id, common.TypeForm)
+				_, err = db.Get(tt.context, tt.id, common.TypeForm)
 				if err == nil {
 					t.Errorf("Could fetch form object again although we deleted it")
 				}

api/fileio.go

@@ -114,17 +114,23 @@ func ZipDir(directory, zipfilename string) error {
 	var wg sync.WaitGroup
 	wg.Add(1)
 
+	failure := make(chan string)
+
 	// don't chdir the server itself
 	go func() {
 		defer wg.Done()
 
-		os.Chdir(directory)
+		if err := os.Chdir(directory); err != nil {
+			failure <- "Failed to changedir: " + err.Error()
+			return
+		}
 		newDir, err := os.Getwd()
 		if err != nil {
+			failure <- "Failed to get cwd: " + err.Error()
 		}
+
 		if newDir != directory {
-			err = errors.New("Failed to changedir!")
+			failure <- "Failed to changedir!"
-			return
 		}
 
 		err = filepath.Walk(".", func(path string, info os.FileInfo, err error) error {
@@ -171,9 +177,19 @@ func ZipDir(directory, zipfilename string) error {
 			_, err = io.Copy(headerWriter, f)
 			return err
 		})
+
+		if err != nil {
+			failure <- "Failed to zip directory: " + err.Error()
+		}
 	}()
 
 	wg.Wait()
 
+	goterr := <-failure
+
+	if goterr != "" {
+		return errors.New(goterr)
+	}
+
 	return err
 }

api/form_handlers.go

@@ -82,7 +82,11 @@ func FormCreate(c *fiber.Ctx, cfg *cfg.Config, db *Db) error {
 	Log("Form created with API-Context %s", entry.Context)
 
 	// we do this in the background to not thwart the server
-	go db.Insert(id, entry)
+	go func() {
+		if err := db.Insert(id, entry); err != nil {
+			Log("Failed to insert: " + err.Error())
+		}
+	}()
 
 	// everything went well so far
 	res := &common.Response{Forms: []*common.Form{entry}}

api/upload_handlers.go

@@ -53,7 +53,10 @@ func UploadPost(c *fiber.Ctx, cfg *cfg.Config, db *Db) error {
 	var returnUrl string
 	var formdata Meta
 
-	os.MkdirAll(filepath.Join(cfg.StorageDir, id), os.ModePerm)
+	if err := os.MkdirAll(filepath.Join(cfg.StorageDir, id), os.ModePerm); err != nil {
+		return JsonStatus(c, fiber.StatusInternalServerError,
+			"Unable to initialize directories: "+err.Error())
+	}
 
 	// fetch auxiliary form data
 	form, err := c.MultipartForm()
@@ -114,7 +117,11 @@ func UploadPost(c *fiber.Ctx, cfg *cfg.Config, db *Db) error {
 	Log("Uploaded with API-Context %s", entry.Context)
 
 	// we do this in the background to not thwart the server
-	go db.Insert(id, entry)
+	go func() {
+		if err := db.Insert(id, entry); err != nil {
+			Log("Failed to insert: " + err.Error())
+		}
+	}()
 
 	// everything went well so far
 	res := &common.Response{Uploads: []*common.Upload{entry}}
@@ -131,7 +138,9 @@ func UploadPost(c *fiber.Ctx, cfg *cfg.Config, db *Db) error {
 			if err == nil {
 				if len(r.Forms) == 1 {
 					if r.Forms[0].Expire == "asap" {
-						db.Delete(apicontext, formid)
+						if err := db.Delete(apicontext, formid); err != nil {
+							Log("Failed to delete formid %s: %s", formid, err.Error())
+						}
 					}
 
 					// email notification to form creator
@@ -184,7 +193,11 @@ func UploadFetch(c *fiber.Ctx, cfg *cfg.Config, db *Db, shallExpire ...bool) err
 
 	if _, err := os.Stat(filename); err != nil {
 		// db entry is there, but file isn't (anymore?)
-		go db.Delete(apicontext, id)
+		go func() {
+			if err := db.Delete(apicontext, id); err != nil {
+				Log("Unable to delete entry id %s: %s", id, err.Error())
+			}
+		}()
 		return fiber.NewError(404, "No download with that id could be found!")
 	}
 
@@ -192,12 +205,14 @@ func UploadFetch(c *fiber.Ctx, cfg *cfg.Config, db *Db, shallExpire ...bool) err
 	err = c.Download(filename, file)
 
 	if len(shallExpire) > 0 {
-		if shallExpire[0] == true {
+		if shallExpire[0] {
 			go func() {
 				// check if we need to delete the file now and do it in the background
 				if upload.Expire == "asap" {
 					cleanup(filepath.Join(cfg.StorageDir, id))
-					db.Delete(apicontext, id)
+					if err := db.Delete(apicontext, id); err != nil {
+						Log("Unable to delete entry id %s: %s", id, err.Error())
+					}
 				}
 			}()
 		}

cfg/config.go

@@ -62,10 +62,10 @@ type Config struct {
 	Network   string
 
 	// only settable via config
-	Apicontexts []Apicontext `koanf:"apicontext"`
+	Apicontexts []Apicontext `koanf:"apicontexts"`
 
 	// smtp settings
-	Mail Mailsettings `koanf:mail`
+	Mail Mailsettings `koanf:"mail"`
 
 	// Internals only
 	RegNormalizedFilename *regexp.Regexp

cmd/root.go

@@ -75,7 +75,9 @@ func Execute() error {
 	f.StringVarP(&conf.AppName, "appname", "n", "ephemerupd "+conf.GetVersion(), "App name to say hi as")
 	f.IntVarP(&conf.BodyLimit, "bodylimit", "b", 10250000000, "Max allowed upload size in bytes")
 
-	f.Parse(os.Args[1:])
+	if err := f.Parse(os.Args[1:]); err != nil {
+		return err
+	}
 
 	// exclude -6 and -4
 	if conf.V4only && conf.V6only {
@@ -86,19 +88,19 @@ func Execute() error {
 	var k = koanf.New(".")
 
 	// Load the config files provided in the commandline or the default locations
-	configfiles := []string{}
+	var configfiles []string
 	configfile, _ := f.GetString("config")
 	if configfile != "" {
 		configfiles = []string{configfile}
 	} else {
 		configfiles = []string{
-			"/etc/ephemerupd.hcl", "/usr/local/etc/ephemerupd.hcl", // unix variants
+			"/etc/ephemerup.hcl", "/usr/local/etc/ephemerup.hcl", // unix variants
-			filepath.Join(os.Getenv("HOME"), ".config", "ephemerupd", "ephemerupd.hcl"),
+			filepath.Join(os.Getenv("HOME"), ".config", "ephemerup", "ephemerup.hcl"),
-			filepath.Join(os.Getenv("HOME"), ".ephemerupd"),
+			filepath.Join(os.Getenv("HOME"), ".ephemerup"),
-			"ephemerupd.hcl",
+			"ephemerup.hcl",
 		}
 	}
-
+	repr.Print(configfiles)
 	for _, cfgfile := range configfiles {
 		if _, err := os.Stat(cfgfile); err == nil {
 			if err := k.Load(file.Provider(cfgfile), hcl.Parser(true)); err != nil {
@@ -109,10 +111,12 @@ func Execute() error {
 	}
 
 	// env overrides config file
-	k.Load(env.Provider("EPHEMERUPD_", ".", func(s string) string {
+	if err := k.Load(env.Provider("EPHEMERUPD_", ".", func(s string) string {
 		return strings.Replace(strings.ToLower(
 			strings.TrimPrefix(s, "EPHEMERUPD_")), "_", ".", -1)
-	}), nil)
+	}), nil); err != nil {
+		return errors.New("error loading environment: " + err.Error())
+	}
 
 	// command line overrides env
 	if err := k.Load(posflag.Provider(f, ".", k), nil); err != nil {
@@ -120,7 +124,9 @@ func Execute() error {
 	}
 
 	// fetch values
-	k.Unmarshal("", &conf)
+	if err := k.Unmarshal("", &conf); err != nil {
+		return errors.New("error unmarshalling: " + err.Error())
+	}
 
 	// there may exist some api context variables
 	GetApicontextsFromEnv(&conf)
@@ -197,9 +203,7 @@ func GetApicontextsFromEnv(conf *cfg.Config) {
 		}
 	}
 
-	for _, ap := range conf.Apicontexts {
+	contexts = append(contexts, conf.Apicontexts...)
-		contexts = append(contexts, ap)
-	}
 
 	conf.Apicontexts = contexts
 }

ephemerup.hcl

@@ -2,7 +2,7 @@
 listen = ":8080"
 bodylimit = 10000
 
-apicontext = [
+apicontexts = [
   {
     context = "root"
     key = "0fddbff5d8010f81cd28a7d77f3e38981b13d6164c2fd6e1c3f60a4287630c37",

upctl/cmd/formcommands.go

@@ -33,8 +33,7 @@ func FormCommand(conf *cfg.Config) *cobra.Command {
 			// errors at this stage do not cause the usage to be shown
 			//cmd.SilenceUsage = true
 			if len(args) == 0 {
-				cmd.Help()
+				return cmd.Help()
-				os.Exit(0)
 			}
 			return nil
 		},

upctl/cmd/root.go

@@ -130,13 +130,12 @@ func initConfig(cmd *cobra.Command, cfg *cfg.Config) error {
 	v.SetEnvPrefix("upctl")
 
 	// map flags to viper
-	bindFlags(cmd, v)
+	return bindFlags(cmd, v)
-
-	return nil
 }
 
 // bind flags to viper settings (env+cfgfile)
-func bindFlags(cmd *cobra.Command, v *viper.Viper) {
+func bindFlags(cmd *cobra.Command, v *viper.Viper) error {
+	var fail error
 	cmd.Flags().VisitAll(func(f *pflag.Flag) {
 		// map flag name to config variable
 		configName := f.Name
@@ -144,7 +143,11 @@ func bindFlags(cmd *cobra.Command, v *viper.Viper) {
 		// use config variable if flag is not set and config is set
 		if !f.Changed && v.IsSet(configName) {
 			val := v.Get(configName)
-			cmd.Flags().Set(f.Name, fmt.Sprintf("%v", val))
+			if err := cmd.Flags().Set(f.Name, fmt.Sprintf("%v", val)); err != nil {
+				fail = err
+			}
 		}
 	})
+
+	return fail
 }

upctl/lib/client.go

@@ -181,7 +181,9 @@ func UploadFiles(w io.Writer, c *cfg.Config, args []string) error {
 		var left float64
 		rq.R.SetUploadCallbackWithInterval(func(info req.UploadInfo) {
 			left = float64(info.UploadedSize) / float64(info.FileSize) * 100.0
-			bar.Add(int(left))
+			if err := bar.Add(int(left)); err != nil {
+				fmt.Print("\r")
+			}
 		}, 10*time.Millisecond)
 	}
 
@@ -278,7 +280,9 @@ func Download(w io.Writer, c *cfg.Config, args []string) error {
 
 		callback := func(info req.DownloadInfo) {
 			if info.Response.Response != nil {
-				bar.Add(1)
+				if err := bar.Add(1); err != nil {
+					fmt.Print("\r")
+				}
 			}
 		}
 
@@ -344,6 +348,4 @@ func CreateForm(w io.Writer, c *cfg.Config) error {
 	}
 
 	return RespondExtended(w, resp)
-
-	return nil
 }

upctl/lib/output.go

@@ -38,8 +38,6 @@ func prepareExpire(expire string, start common.Timestamp) string {
 		return time.Unix(start.Unix()+int64(common.Duration2int(expire)), 0).
 			Format("2006-01-02 15:04:05")
 	}
-
-	return ""
 }
 
 // generic table writer

upctl/t/t1

@@ -1 +0,0 @@
-Mon Mar 20 12:16:26 PM CET 2023