Bladeren bron

updating configurable options

* added option for clamav host
* added temp folder default
* renamed AWS_ACCESS_KEY to AWS_ACCESS_KEY_ID to conform with AWS standard
tags/v1.0.0
Remco 9 jaren geleden
bovenliggende
commit
1ecaf94d6d
2 gewijzigde bestanden met toevoegingen van 16 en 9 verwijderingen
  1. +1
    -1
      transfersh-server/handlers.go
  2. +15
    -8
      transfersh-server/main.go

+ 1
- 1
transfersh-server/handlers.go Bestand weergeven

@@ -195,7 +195,7 @@ func scanHandler(w http.ResponseWriter, r *http.Request) {


reader = r.Body reader = r.Body


c := clamd.NewClamd("/tmp/clamd.socket")
c := clamd.NewClamd(config.CLAMAV_DAEMON_HOST)


response, err := c.ScanStream(reader) response, err := c.ScanStream(reader)
if err != nil { if err != nil {


+ 15
- 8
transfersh-server/main.go Bestand weergeven

@@ -44,21 +44,28 @@ const SERVER_INFO = "transfer.sh"
const _24K = (1 << 20) * 24 const _24K = (1 << 20) * 24


var config struct { var config struct {
AWS_ACCESS_KEY string
AWS_SECRET_KEY string
BUCKET string
VIRUSTOTAL_KEY string
Temp string
AWS_ACCESS_KEY string
AWS_SECRET_KEY string
BUCKET string
VIRUSTOTAL_KEY string
CLAMAV_DAEMON_HOST string "/tmp/clamd.socket"
Temp string
} }


var storage Storage var storage Storage


func init() { func init() {
config.AWS_ACCESS_KEY = os.Getenv("AWS_ACCESS_KEY")
config.AWS_ACCESS_KEY = os.Getenv("AWS_ACCESS_KEY_ID")
config.AWS_SECRET_KEY = os.Getenv("AWS_SECRET_KEY") config.AWS_SECRET_KEY = os.Getenv("AWS_SECRET_KEY")
config.BUCKET = os.Getenv("BUCKET") config.BUCKET = os.Getenv("BUCKET")

config.VIRUSTOTAL_KEY = os.Getenv("VIRUSTOTAL_KEY") config.VIRUSTOTAL_KEY = os.Getenv("VIRUSTOTAL_KEY")
config.Temp = ""

if os.Getenv("CLAMAV_DAEMON_HOST") != "" {
config.CLAMAV_DAEMON_HOST = os.Getenv("CLAMAV_DAEMON_HOST")
}

config.Temp = os.TempDir()
} }


func main() { func main() {
@@ -112,7 +119,7 @@ func main() {
r.NotFoundHandler = http.HandlerFunc(notFoundHandler) r.NotFoundHandler = http.HandlerFunc(notFoundHandler)


port := flag.String("port", "8080", "port number, default: 8080") port := flag.String("port", "8080", "port number, default: 8080")
temp := flag.String("temp", "", "")
temp := flag.String("temp", config.Temp, "")
basedir := flag.String("basedir", "", "") basedir := flag.String("basedir", "", "")
logpath := flag.String("log", "", "") logpath := flag.String("log", "", "")
provider := flag.String("provider", "s3", "") provider := flag.String("provider", "s3", "")


Laden…
Annuleren
Opslaan