LOTS of security fixes of containers and other versions
This commit is contained in:
frikky
+2
-2
@@ -1,4 +1,4 @@
|
||||
FROM golang:1.16.0-buster as builder
|
||||
FROM golang:1.17.2-buster as builder
|
||||
|
||||
# Add files
|
||||
RUN mkdir /app
|
||||
@@ -22,7 +22,7 @@ RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o webapp .
|
||||
FROM alpine:latest as certs
|
||||
RUN apk --update add ca-certificates
|
||||
|
||||
FROM alpine:3.12
|
||||
FROM alpine:3.14.2
|
||||
|
||||
COPY --from=builder /app/ /app
|
||||
COPY --from=builder /app_sdk/ /app_sdk
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
FROM python:3.9.1-alpine as base
|
||||
#FROM python:3.9.1-alpine as base
|
||||
FROM python:3.10.0-alpine as base
|
||||
FROM base as builder
|
||||
RUN apk --no-cache add --update alpine-sdk libffi libffi-dev musl-dev openssl-dev tzdata coreutils
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@ NAME=shuffle-app_sdk
|
||||
VERSION=0.9.23
|
||||
|
||||
docker rmi docker.pkg.github.com/frikky/shuffle/$NAME:$VERSION --force
|
||||
docker build . -f Dockerfile -t frikky/shuffle:app_sdk -t frikky/$NAME:$VERSION -t docker.pkg.github.com/frikky/shuffle/$NAME:$VERSION -t ghcr.io/frikky/$NAME:$VERSION
|
||||
docker build . -f Dockerfile -t frikky/shuffle:app_sdk -t frikky/$NAME:$VERSION -t docker.pkg.github.com/frikky/shuffle/$NAME:$VERSION -t ghcr.io/frikky/$NAME:$VERSION -t ghcr.io/frikky/$NAME:nightly
|
||||
|
||||
#docker push frikky/$NAME:$VERSION
|
||||
#docker push docker.pkg.github.com/frikky/shuffle/$NAME:$VERSION
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
urllib3==1.25.9
|
||||
urllib3==1.26.5
|
||||
requests==2.25.1
|
||||
MarkupSafe==2.0.1
|
||||
liquidpy==0.7.1
|
||||
|
||||
@@ -2,7 +2,7 @@ module shuffle
|
||||
|
||||
go 1.13
|
||||
|
||||
//replace github.com/frikky/shuffle-shared => ../../../../git/shuffle-shared
|
||||
replace github.com/shuffle/shuffle-shared => ../../../../git/shuffle-shared
|
||||
|
||||
//replace github.com/frikky/kin-openapi => ../../../../git/kin-openapi
|
||||
|
||||
@@ -23,7 +23,7 @@ require (
|
||||
github.com/docker/go-units v0.4.0 // indirect
|
||||
github.com/elastic/go-elasticsearch/v7 v7.13.1 // indirect
|
||||
github.com/frikky/kin-openapi v0.39.0
|
||||
github.com/frikky/shuffle-shared v0.1.14
|
||||
github.com/frikky/shuffle-shared v0.1.15 // indirect
|
||||
github.com/fsouza/go-dockerclient v1.7.2
|
||||
github.com/ghodss/yaml v1.0.0
|
||||
github.com/go-git/go-billy/v5 v5.0.0
|
||||
@@ -36,6 +36,7 @@ require (
|
||||
github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d // indirect
|
||||
github.com/patrickmn/go-cache v2.1.0+incompatible
|
||||
github.com/satori/go.uuid v1.2.0
|
||||
github.com/shuffle/shuffle-shared v0.1.14
|
||||
go4.org v0.0.0-20201209231011-d4a079459e60 // indirect
|
||||
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
|
||||
golang.org/x/oauth2 v0.0.0-20210113160501-8b1d76fa0423
|
||||
|
||||
@@ -2742,121 +2742,6 @@ func validateAppYaml(fileLocation string) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func handleSendalert(resp http.ResponseWriter, request *http.Request) {
|
||||
user, err := shuffle.HandleApiAuthentication(resp, request)
|
||||
if err != nil {
|
||||
log.Printf("[WARNING] Api authentication failed in sendalert: %s", err)
|
||||
resp.WriteHeader(401)
|
||||
resp.Write([]byte(`{"success": false}`))
|
||||
return
|
||||
}
|
||||
|
||||
if user.Role != "mail" && user.Role != "admin" {
|
||||
resp.WriteHeader(401)
|
||||
resp.Write([]byte(`{"success": false, "reason": "You don't have access to send mail"}`))
|
||||
return
|
||||
}
|
||||
|
||||
// ReferenceExecution and below are for execution continuations when user inputs arrive
|
||||
type mailcheck struct {
|
||||
Targets []string `json:"targets"`
|
||||
Body string `json:"body"`
|
||||
Subject string `json:"subject"`
|
||||
Type string `json:"type"`
|
||||
SenderCompany string `json:"sender_company"`
|
||||
ReferenceExecution string `json:"reference_execution"`
|
||||
WorkflowId string `json:"workflow_id"`
|
||||
ExecutionType string `json:"execution_type"`
|
||||
Start string `json:"start"`
|
||||
}
|
||||
|
||||
body, err := ioutil.ReadAll(request.Body)
|
||||
if err != nil {
|
||||
log.Printf("Body data error on mail: %s", err)
|
||||
resp.WriteHeader(401)
|
||||
resp.Write([]byte(`{"success": false}`))
|
||||
return
|
||||
}
|
||||
|
||||
var mailbody mailcheck
|
||||
err = json.Unmarshal(body, &mailbody)
|
||||
if err != nil {
|
||||
log.Printf("Unmarshal error on mail: %s", err)
|
||||
resp.WriteHeader(401)
|
||||
resp.Write([]byte(`{"success": false}`))
|
||||
return
|
||||
}
|
||||
|
||||
ctx := context.Background()
|
||||
confirmMessage := `
|
||||
You have a new alert from shuffler.io!
|
||||
|
||||
%s
|
||||
|
||||
Please contact us at shuffler.io or frikky@shuffler.io if there is an issue with this message.`
|
||||
|
||||
parsedBody := fmt.Sprintf(confirmMessage, mailbody.Body)
|
||||
|
||||
// FIXME - Make a continuation email here - might need more info from worker
|
||||
// making the request, e.g. what the next start-node is and execution_id for
|
||||
// how to make the links
|
||||
if mailbody.Type == "User input" {
|
||||
authkey := uuid.NewV4().String()
|
||||
|
||||
log.Printf("Should handle differentiator for user input in email!")
|
||||
log.Printf("%#v", mailbody)
|
||||
|
||||
url := "https://shuffler.io"
|
||||
//url := "http://localhost:5001"
|
||||
continueUrl := fmt.Sprintf("%s/api/v1/workflows/%s/execute?authorization=%s&start=%s&reference_execution=%s&answer=true", url, mailbody.WorkflowId, authkey, mailbody.Start, mailbody.ReferenceExecution)
|
||||
stopUrl := fmt.Sprintf("%s/api/v1/workflows/%s/execute?authorization=%s&start=%s&reference_execution=%s&answer=false", url, mailbody.WorkflowId, authkey, mailbody.Start, mailbody.ReferenceExecution)
|
||||
|
||||
//item := &memcache.Item{
|
||||
// Key: authkey,
|
||||
// Value: []byte(fmt.Sprintf(`{"role": "workflow_%s"}`, mailbody.WorkflowId)),
|
||||
// Expiration: time.Minute * 1200,
|
||||
//}
|
||||
|
||||
//if err := memcache.Add(ctx, item); err == memcache.ErrNotStored {
|
||||
// if err := memcache.Set(ctx, item); err != nil {
|
||||
// log.Printf("Error setting new user item: %v", err)
|
||||
// }
|
||||
//} else if err != nil {
|
||||
// log.Printf("error adding item: %v", err)
|
||||
//} else {
|
||||
// log.Printf("Set cache for %s", item.Key)
|
||||
//}
|
||||
|
||||
parsedBody = fmt.Sprintf(`
|
||||
Action required!
|
||||
|
||||
%s
|
||||
|
||||
If this is TRUE click this: %s
|
||||
|
||||
IF THIS IS FALSE, click this: %s
|
||||
|
||||
Please contact us at shuffler.io or frikky@shuffler.io if there is an issue with this message.
|
||||
`, mailbody.Body, continueUrl, stopUrl)
|
||||
|
||||
}
|
||||
|
||||
msg := &mail.Message{
|
||||
Sender: "Shuffle <frikky@shuffler.io>",
|
||||
To: mailbody.Targets,
|
||||
Subject: fmt.Sprintf("Shuffle - %s - %s", mailbody.Type, mailbody.Subject),
|
||||
Body: parsedBody,
|
||||
}
|
||||
|
||||
log.Println(msg.Body)
|
||||
if err := mail.Send(ctx, msg); err != nil {
|
||||
log.Printf("Couldn't send email: %v", err)
|
||||
}
|
||||
|
||||
resp.WriteHeader(200)
|
||||
resp.Write([]byte(`{"success": true}`))
|
||||
}
|
||||
|
||||
func setBadMemcache(ctx context.Context, path string) {
|
||||
// Add to cache if it doesn't exist
|
||||
//item := &memcache.Item{
|
||||
|
||||
Reference in New Issue
Block a user