luzifer/tex-api
1
0
Fork 0
mirror of https://github.com/Luzifer/tex-api.git synced 2024-11-12 18:12:43 +00:00
Code Issues Releases Wiki Activity

Fix linter errors / warnings

Browse source 
Signed-off-by: Knut Ahlers <knut@ahlers.me>
This commit is contained in:
Knut Ahlers 2018-09-17 11:45:26 +02:00
parent 362aa7039c
commit 534fe608db
Signed by: luzifer
GPG key ID: DC2729FDD34BE99E
2 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
assets.go
View file

@ -44,13 +44,15 @@ func buildAssetsZIP(uid uuid.UUID) (io.Reader, error) {
if err != nil { if err != nil {
return err return err
} }
osFile, err := os.Open(p) osFile, err := os.Open(p) // #nosec G304
if err != nil { if err != nil {
return err return err
} }
io.Copy(zipFile, osFile) if _, err := io.Copy(zipFile, osFile); err != nil {
osFile.Close() return err
}
osFile.Close() // #nosec G104
return nil return nil
}) })
@ -85,13 +87,15 @@ func buildAssetsTAR(uid uuid.UUID) (io.Reader, error) {
if err != nil { if err != nil {
return err return err
} }
osFile, err := os.Open(p) osFile, err := os.Open(p) // #nosec G304
if err != nil { if err != nil {
return err return err
} }
io.Copy(w, osFile) if _, err := io.Copy(w, osFile); err != nil {
osFile.Close() return err
}
osFile.Close() // #nosec G104
return nil return nil
}) })

15
main.go
View file

@ -58,6 +58,7 @@ func loadStatusByUUID(uid uuid.UUID) (*jobStatus, error) {
statusFile := pathFromUUID(uid, filenameStatus) statusFile := pathFromUUID(uid, filenameStatus)
status := jobStatus{} status := jobStatus{}
// #nosec G304
if f, err := os.Open(statusFile); err == nil { if f, err := os.Open(statusFile); err == nil {
defer f.Close() defer f.Close()
if err = json.NewDecoder(f).Decode(&status); err != nil { if err = json.NewDecoder(f).Decode(&status); err != nil {
@ -76,7 +77,7 @@ func (s *jobStatus) UpdateStatus(st status) {
} }
func (s jobStatus) Save() error { func (s jobStatus) Save() error {
uid, _ := uuid.FromString(s.UUID) uid, _ := uuid.FromString(s.UUID) // #nosec G104
f, err := os.Create(pathFromUUID(uid, filenameStatus)) f, err := os.Create(pathFromUUID(uid, filenameStatus))
if err != nil { if err != nil {
return err return err
@ -116,7 +117,7 @@ func main() {
func serverErrorf(res http.ResponseWriter, tpl string, args ...interface{}) { func serverErrorf(res http.ResponseWriter, tpl string, args ...interface{}) {
log.Errorf(tpl, args...) log.Errorf(tpl, args...)
http.Error(res, "An error ocurred. See details in log.", http.StatusInternalServerError) http.Error(res, "An error occurred. See details in log.", http.StatusInternalServerError)
} }
func pathFromUUID(uid uuid.UUID, filename string) string { func pathFromUUID(uid uuid.UUID, filename string) string {
@ -132,7 +133,7 @@ func startNewJob(res http.ResponseWriter, r *http.Request) {
inputFile := pathFromUUID(jobUUID, filenameInput) inputFile := pathFromUUID(jobUUID, filenameInput)
statusFile := pathFromUUID(jobUUID, filenameStatus) statusFile := pathFromUUID(jobUUID, filenameStatus)
if err := os.Mkdir(path.Dir(inputFile), 0755); err != nil { if err := os.Mkdir(path.Dir(inputFile), 0750); err != nil {
log.Errorf("Unable to create job dir %q: %s", path.Dir(inputFile), err) log.Errorf("Unable to create job dir %q: %s", path.Dir(inputFile), err)
} }
@ -142,7 +143,7 @@ func startNewJob(res http.ResponseWriter, r *http.Request) {
serverErrorf(res, "Unable to copy input file %q: %s", inputFile, copyErr) serverErrorf(res, "Unable to copy input file %q: %s", inputFile, copyErr)
return return
} }
f.Sync() f.Sync() // #nosec G104
} else { } else {
serverErrorf(res, "Unable to write input file %q: %s", inputFile, err) serverErrorf(res, "Unable to write input file %q: %s", inputFile, err)
return return
@ -243,7 +244,7 @@ func downloadAssets(res http.ResponseWriter, r *http.Request) {
) )
switch r.Header.Get("Accept") { switch r.Header.Get("Accept") {
case "application/tar", "application/x-tar", "applicaton/x-gtar", "multipart/x-tar", "application/x-compress", "application/x-compressed": case "application/tar", "application/x-tar", "application/x-gtar", "multipart/x-tar", "application/x-compress", "application/x-compressed":
contentType = "application/tar" contentType = "application/tar"
content, err = buildAssetsTAR(uid) content, err = buildAssetsTAR(uid)
filename = uid.String() + ".tar" filename = uid.String() + ".tar"
@ -261,7 +262,7 @@ func downloadAssets(res http.ResponseWriter, r *http.Request) {
res.Header().Set("Content-Type", contentType) res.Header().Set("Content-Type", contentType)
res.WriteHeader(http.StatusOK) res.WriteHeader(http.StatusOK)
io.Copy(res, content) io.Copy(res, content) // #nosec G104
} }
func jobProcessor(uid uuid.UUID) { func jobProcessor(uid uuid.UUID) {
@ -272,7 +273,7 @@ func jobProcessor(uid uuid.UUID) {
return return
} }
cmd := exec.Command("/bin/bash", cfg.ExecutionScript) cmd := exec.Command("/bin/bash", cfg.ExecutionScript) // #nosec G204
cmd.Dir = processingDir cmd.Dir = processingDir
cmd.Stderr = log.StandardLogger().WriterLevel(log.ErrorLevel) cmd.Stderr = log.StandardLogger().WriterLevel(log.ErrorLevel)