Explorar el Código

Fix: Change virustotal go dependency & endpoint (#657)

* build(deps): replace `dutchcoders/go-virustotal` with `Aetherinox/go-virustotal`

replace go dependency `dutchcoders/go-virustotal` with updated package `Aetherinox/go-virustotal`

fixes issue with being able to utilize virustotal endpoint when transfering

* build(deps): replace `dutchcoders/go-virustotal` with `Aetherinox/go-virustotal`

replace go dependency `dutchcoders/go-virustotal` with updated package `Aetherinox/go-virustotal`

fixes issue with being able to utilize virustotal endpoint when transfering

* docs(readme): add parameter`virustotal-key` to docs

* docs(readme): correct auto-formatting on YYYY
Aetherinox hace 3 meses
padre
commit
f833cd4dac
Se han modificado 4 ficheros con 223 adiciones y 58 borrados
  1. 219 54
      README.md
  2. 1 1
      go.mod
  3. 2 2
      go.sum
  4. 1 1
      server/virustotal.go

+ 219 - 54
README.md

@@ -4,6 +4,12 @@ Easy and fast file sharing from the command-line. This code contains the server
 
 Transfer.sh currently supports the s3 (Amazon S3), gdrive (Google Drive), storj (Storj) providers, and local file system (local).
 
+<br />
+
+---
+
+<br />
+
 ## Disclaimer
 
 @stefanbenten happens to be a maintainer of this repository _and_ the person who host a well known public installation of the software in the repo.
@@ -14,72 +20,134 @@ No third-party public installation of the software in the repo will be advertise
 
 The official position of me, @aspacca, as maintainer of the repo, is that if you want to use the software you should host your own installation.
 
+<br />
+
+---
+
+<br />
+
 ## Usage
 
-### Upload:
+This section outlines how to use transfer.sh
+
+<br />
+
+### Upload
+
 ```bash
 $ curl -v --upload-file ./hello.txt https://transfer.sh/hello.txt
 ```
 
-### Encrypt & Upload:
+<br />
+
+### Encrypt & Upload
+
 ```bash
 $ gpg --armor --symmetric --output - /tmp/hello.txt | curl --upload-file - https://transfer.sh/test.txt
 ```
 
-### Download & Decrypt:
+<br />
+
+### Download & Decrypt
+
 ```bash
 $ curl https://transfer.sh/1lDau/test.txt | gpg --decrypt --output /tmp/hello.txt
 ```
 
-### Upload to Virustotal:
+<br />
+
+### Upload to Virustotal
+
 ```bash
 $ curl -X PUT --upload-file nhgbhhj https://transfer.sh/test.txt/virustotal
 ```
 
+<br />
+
 ### Deleting
+
 ```bash
 $ curl -X DELETE <X-Url-Delete Response Header URL>
 ```
 
+<br />
+
+---
+
+<br />
+
 ## Request Headers
 
+This section explains how to handle request headers with curl:
+
+<br />
+
 ### Max-Downloads
+
 ```bash
 $ curl --upload-file ./hello.txt https://transfer.sh/hello.txt -H "Max-Downloads: 1" # Limit the number of downloads
 ```
 
+<br />
+
 ### Max-Days
+
 ```bash
 $ curl --upload-file ./hello.txt https://transfer.sh/hello.txt -H "Max-Days: 1" # Set the number of days before deletion
 ```
 
+<br />
+
 ### X-Encrypt-Password
+
 #### Beware, use this feature only on your self-hosted server: trusting a third-party service for server side encryption is at your own risk
 ```bash
 $ curl --upload-file ./hello.txt https://your-transfersh-instance.tld/hello.txt -H "X-Encrypt-Password: test" # Encrypt the content server side with AES256 using "test" as password
 ```
 
+<br />
+
 ### X-Decrypt-Password
 #### Beware, use this feature only on your self-hosted server: trusting a third-party service for server side encryption is at your own risk
+
 ```bash
 $ curl https://your-transfersh-instance.tld/BAYh0/hello.txt -H "X-Decrypt-Password: test" # Decrypt the content server side with AES256 using "test" as password
 ```
 
+<br />
+
+---
+
+<br />
+
 ## Response Headers
 
+This section explains how to handle response headers:
+
+<br />
+
 ### X-Url-Delete
 
-The URL used to request the deletion of a file and returned as a response header.
+The URL used to request the deletion of a file and returned as a response header:
+
 ```bash
 curl -sD - --upload-file ./hello.txt https://transfer.sh/hello.txt | grep -i -E 'transfer\.sh|x-url-delete'
 x-url-delete: https://transfer.sh/hello.txt/BAYh0/hello.txt/PDw0NHPcqU
 https://transfer.sh/hello.txt/BAYh0/hello.txt
 ```
 
+<br />
+
+---
+
+<br />
+
 ## Examples
 
 See good usage examples on [examples.md](examples.md)
 
+<br />
+
 ## Link aliases
 
 Create direct download link:
@@ -90,59 +158,72 @@ Inline file:
 
 https://transfer.sh/1lDau/test.txt --> https://transfer.sh/inline/1lDau/test.txt
 
+<br />
+
+---
+
+<br />
+
 ## Usage
 
-Parameter | Description                                                                                 | Value                        | Env                         
---- |---------------------------------------------------------------------------------------------|------------------------------|-----------------------------
-listener | port to use for http (:80)                                                                  |                              | LISTENER                    |
-profile-listener | port to use for profiler (:6060)                                                            |                              | PROFILE_LISTENER            |
-force-https | redirect to https                                                                           | false                        | FORCE_HTTPS                 
-tls-listener | port to use for https (:443)                                                                |                              | TLS_LISTENER                |
-tls-listener-only | flag to enable tls listener only                                                            |                              | TLS_LISTENER_ONLY           |
-tls-cert-file | path to tls certificate                                                                     |                              | TLS_CERT_FILE               |
-tls-private-key | path to tls private key                                                                     |                              | TLS_PRIVATE_KEY             |
-http-auth-user | user for basic http auth on upload                                                          |                              | HTTP_AUTH_USER              |
-http-auth-pass | pass for basic http auth on upload                                                          |                              | HTTP_AUTH_PASS              |
-http-auth-htpasswd | htpasswd file path for basic http auth on upload                                            |                              | HTTP_AUTH_HTPASSWD          |
-http-auth-ip-whitelist | comma separated list of ips allowed to upload without being challenged an http auth        |                              | HTTP_AUTH_IP_WHITELIST      |
-ip-whitelist | comma separated list of ips allowed to connect to the service                               |                              | IP_WHITELIST                |
-ip-blacklist | comma separated list of ips not allowed to connect to the service                           |                              | IP_BLACKLIST                |
-temp-path | path to temp folder                                                                         | system temp                  | TEMP_PATH                   |
-web-path | path to static web files (for development or custom front end)                              |                              | WEB_PATH                    |
-proxy-path | path prefix when service is run behind a proxy                                              |                              | PROXY_PATH                  |
-proxy-port | port of the proxy when the service is run behind a proxy                                    |                              | PROXY_PORT                  |
-email-contact | email contact for the front end                                                             |                              | EMAIL_CONTACT               |
-ga-key | google analytics key for the front end                                                      |                              | GA_KEY                      |
-provider | which storage provider to use                                                               | (s3, storj, gdrive or local) |
-uservoice-key | user voice key for the front end                                                            |                              | USERVOICE_KEY               |
-aws-access-key | aws access key                                                                              |                              | AWS_ACCESS_KEY              |
-aws-secret-key | aws access key                                                                              |                              | AWS_SECRET_KEY              |
-bucket | aws bucket                                                                                  |                              | BUCKET                      |
-s3-endpoint | Custom S3 endpoint.                                                                         |                              | S3_ENDPOINT                 |
-s3-region | region of the s3 bucket                                                                     | eu-west-1                    | S3_REGION                   |
-s3-no-multipart | disables s3 multipart upload                                                                | false                        | S3_NO_MULTIPART             |
-s3-path-style | Forces path style URLs, required for Minio.                                                 | false                        | S3_PATH_STYLE               |
-storj-access | Access for the project                                                                      |                              | STORJ_ACCESS                |
-storj-bucket | Bucket to use within the project                                                            |                              | STORJ_BUCKET                |
-basedir | path storage for local/gdrive provider                                                      |                              | BASEDIR                     |
-gdrive-client-json-filepath | path to oauth client json config for gdrive provider                                        |                              | GDRIVE_CLIENT_JSON_FILEPATH |
-gdrive-local-config-path | path to store local transfer.sh config cache for gdrive provider                            |                              | GDRIVE_LOCAL_CONFIG_PATH    |
-gdrive-chunk-size | chunk size for gdrive upload in megabytes, must be lower than available memory (8 MB)       |                              | GDRIVE_CHUNK_SIZE           |
-lets-encrypt-hosts | hosts to use for lets encrypt certificates (comma separated)                                |                              | HOSTS                       |
-log | path to log file                                                                            |                              | LOG                         |
-cors-domains | comma separated list of domains for CORS, setting it enable CORS                            |                              | CORS_DOMAINS                |
-clamav-host | host for clamav feature                                                                     |                              | CLAMAV_HOST                 |
-perform-clamav-prescan | prescan every upload through clamav feature (clamav-host must be a local clamd unix socket) |                              | PERFORM_CLAMAV_PRESCAN      |
-rate-limit | request per minute                                                                          |                              | RATE_LIMIT                  |
-max-upload-size | max upload size in kilobytes                                                                |                              | MAX_UPLOAD_SIZE             |
-purge-days | number of days after the uploads are purged automatically                                   |                              | PURGE_DAYS                  |   
-purge-interval | interval in hours to run the automatic purge for (not applicable to S3 and Storj)           |                              | PURGE_INTERVAL              |   
-random-token-length | length of the random token for the upload path (double the size for delete path)            | 6                            | RANDOM_TOKEN_LENGTH         |   
+Parameter | Description                                                                             | Value                         | Env                         
+--- |-----------------------------------------------------------------------------------------------|-------------------------------|-------------------------------|
+listener | port to use for http (:80)                                                               |                               | LISTENER                      |
+profile-listener | port to use for profiler (:6060)                                                 |                               | PROFILE_LISTENER              |
+force-https | redirect to https                                                                     | false                         | FORCE_HTTPS                   |
+tls-listener | port to use for https (:443)                                                         |                               | TLS_LISTENER                  |
+tls-listener-only | flag to enable tls listener only                                                |                               | TLS_LISTENER_ONLY             |
+tls-cert-file | path to tls certificate                                                             |                               | TLS_CERT_FILE                 |
+tls-private-key | path to tls private key                                                           |                               | TLS_PRIVATE_KEY               |
+http-auth-user | user for basic http auth on upload                                                 |                               | HTTP_AUTH_USER                |
+http-auth-pass | pass for basic http auth on upload                                                 |                               | HTTP_AUTH_PASS                |
+http-auth-htpasswd | htpasswd file path for basic http auth on upload                               |                               | HTTP_AUTH_HTPASSWD            |
+http-auth-ip-whitelist | comma separated list of allowed ips to upload without auth challenge       |                               | HTTP_AUTH_IP_WHITELIST        |
+virustotal-key | VirusTotal API key                                                                 |                               | VIRUSTOTAL_KEY                |
+ip-whitelist | comma separated list of ips allowed to connect to the service                        |                               | IP_WHITELIST                  |
+ip-blacklist | comma separated list of ips not allowed to connect to the service                    |                               | IP_BLACKLIST                  |
+temp-path | path to temp folder                                                                     | system temp                   | TEMP_PATH                     |
+web-path | path to static web files (for development or custom front end)                           |                               | WEB_PATH                      |
+proxy-path | path prefix when service is run behind a proxy                                         |                               | PROXY_PATH                    |
+proxy-port | port of the proxy when the service is run behind a proxy                               |                               | PROXY_PORT                    |
+email-contact | email contact for the front end                                                     |                               | EMAIL_CONTACT                 |
+ga-key | google analytics key for the front end                                                     |                               | GA_KEY                        |
+provider | which storage provider to use                                                            | (s3, storj, gdrive or local)  |                               |
+uservoice-key | user voice key for the front end                                                    |                               | USERVOICE_KEY                 |
+aws-access-key | aws access key                                                                     |                               | AWS_ACCESS_KEY                |
+aws-secret-key | aws access key                                                                     |                               | AWS_SECRET_KEY                |
+bucket | aws bucket                                                                                 |                               | BUCKET                        |
+s3-endpoint | Custom S3 endpoint.                                                                   |                               | S3_ENDPOINT                   |
+s3-region | region of the s3 bucket                                                                 | eu-west-1                     | S3_REGION                     |
+s3-no-multipart | disables s3 multipart upload                                                      | false                         | S3_NO_MULTIPART               |
+s3-path-style | Forces path style URLs, required for Minio.                                         | false                         | S3_PATH_STYLE                 |
+storj-access | Access for the project                                                               |                               | STORJ_ACCESS                  |
+storj-bucket | Bucket to use within the project                                                     |                               | STORJ_BUCKET                  |
+basedir | path storage for local/gdrive provider                                                    |                               | BASEDIR                       |
+gdrive-client-json-filepath | path to oauth client json config for gdrive provider                  |                               | GDRIVE_CLIENT_JSON_FILEPATH   |
+gdrive-local-config-path | path to store local transfer.sh config cache for gdrive provider         |                               | GDRIVE_LOCAL_CONFIG_PATH      |
+gdrive-chunk-size | chunk size for gdrive upload in megabytes, must be lower than available memory (8 MB) |                         | GDRIVE_CHUNK_SIZE             |
+lets-encrypt-hosts | hosts to use for lets encrypt certificates (comma separated)                   |                               | HOSTS                         |
+log | path to log file                                                                              |                               | LOG                           |
+cors-domains | comma separated list of domains for CORS, setting it enable CORS                     |                               | CORS_DOMAINS                  |
+clamav-host | host for clamav feature                                                               |                               | CLAMAV_HOST                   |
+perform-clamav-prescan | prescan every upload using clamav (clamav-host must be local clamd unix socket)    |                       | PERFORM_CLAMAV_PRESCAN        |
+rate-limit | request per minute                                                                     |                               | RATE_LIMIT                    |
+max-upload-size | max upload size in kilobytes                                                      |                               | MAX_UPLOAD_SIZE               |
+purge-days | number of days after the uploads are purged automatically                              |                               | PURGE_DAYS                    |   
+purge-interval | interval (hours) to run automatic purge for (excluding S3 and Storj)               |                               | PURGE_INTERVAL                |   
+random-token-length | length of random token for upload path (double the size for delete path)      | 6                             | RANDOM_TOKEN_LENGTH           |   
 
 If you want to use TLS using lets encrypt certificates, set lets-encrypt-hosts to your domain, set tls-listener to :443 and enable force-https.
 
 If you want to use TLS using your own certificates, set tls-listener to :443, force-https, tls-cert-file and tls-private-key.
 
+<br />
+
+---
+
+<br />
+
 ## Development
 
 Switched to GO111MODULE
@@ -151,6 +232,12 @@ Switched to GO111MODULE
 go run main.go --provider=local --listener :8080 --temp-path=/tmp/ --basedir=/tmp/
 ```
 
+<br />
+
+---
+
+<br />
+
 ## Build
 
 ```bash
@@ -159,6 +246,12 @@ $ cd transfer.sh
 $ go build -o transfersh main.go
 ```
 
+<br />
+
+---
+
+<br />
+
 ## Docker
 
 For easy deployment, we've created an official Docker container. There are two variants, differing only by which user runs the process.
@@ -172,21 +265,31 @@ The default one will run as `root`:
 docker run --publish 8080:8080 dutchcoders/transfer.sh:latest --provider local --basedir /tmp/
 ```
 
+<br />
+
 ### No root
 
 The `-noroot` tags indicate image builds that run with least priviledge to reduce the attack surface might an application get compromised.
+
 > [!NOTE]
 > Using `-noroot` is **recommended**
 
+<br />
+
 The one tagged with the suffix `-noroot` will use `5000` as both UID and GID:
+
 ```bash
 docker run --publish 8080:8080 dutchcoders/transfer.sh:latest-noroot --provider local --basedir /tmp/
 ```
 
+<br />
+
 > [!NOTE]
 > Development history details at:
 > - https://github.com/dutchcoders/transfer.sh/pull/418
 
+<br />
+
 ### Tags
 
 Name | Usage
@@ -200,9 +303,12 @@ edge-noroot| Latest CI build after every commit on `main` using [no root]
 x.y.z| CI build after tagging a release
 x.y.z-noroot| CI build after tagging a release using [no root]
 
+<br />
 
 ### Building the Container
+
 You can also build the container yourself. This allows you to choose which UID/GID will be used, e.g. when using NFS mounts:
+
 ```bash
 # Build arguments:
 # * RUNAS: If empty, the container will run as root.
@@ -213,6 +319,12 @@ You can also build the container yourself. This allows you to choose which UID/G
 docker build -t transfer.sh-noroot --build-arg RUNAS=doesntmatter --build-arg PUID=1337 --build-arg PGID=1338 .
 ```
 
+<br />
+
+---
+
+<br />
+
 ## S3 Usage
 
 For the usage with a AWS S3 Bucket, you just need to specify the following options:
@@ -224,10 +336,18 @@ For the usage with a AWS S3 Bucket, you just need to specify the following optio
 
 If you specify the s3-region, you don't need to set the endpoint URL since the correct endpoint will used automatically.
 
+<br />
+
 ### Custom S3 providers
 
 To use a custom non-AWS S3 provider, you need to specify the endpoint as defined from your cloud provider.
 
+<br />
+
+---
+
+<br />
+
 ## Storj Network Provider
 
 To use the Storj Network as a storage provider you need to specify the following flags:
@@ -235,6 +355,8 @@ To use the Storj Network as a storage provider you need to specify the following
 - storj-access _(either via flag or environment variable STORJ_ACCESS)_
 - storj-bucket _(either via flag or environment variable STORJ_BUCKET)_
 
+<br />
+
 ### Creating Bucket and Scope
 
 You need to create an access grant (or copy it from the uplink configuration) and a bucket in preparation.
@@ -249,12 +371,19 @@ Afterwards, you can copy the access grant and then start the startup of the tran
 It is recommended to provide both the access grant and the bucket name as ENV Variables for enhanced security.
 
 Example:
+
 ```
 export STORJ_BUCKET=<BUCKET NAME>
 export STORJ_ACCESS=<ACCESS GRANT>
 transfer.sh --provider storj
 ```
 
+<br />
+
+---
+
+<br />
+
 ## Google Drive Usage
 
 For the usage with Google drive, you need to specify the following options:
@@ -263,14 +392,24 @@ For the usage with Google drive, you need to specify the following options:
 - gdrive-local-config-path
 - basedir
 
+<br />
+
 ### Creating Gdrive Client Json
 
 You need to create an OAuth Client id from console.cloud.google.com, download the file, and place it into a safe directory.
 
+<br />
+
 ### Usage example
 
 ```go run main.go --provider gdrive --basedir /tmp/ --gdrive-client-json-filepath /[credential_dir] --gdrive-local-config-path [directory_to_save_config] ```
 
+<br />
+
+---
+
+<br />
+
 ## Shell functions
 
 ### Bash, ash and zsh (multiple files uploaded as zip archive)
@@ -279,11 +418,14 @@ You need to create an OAuth Client id from console.cloud.google.com, download th
 transfer() (if [ $# -eq 0 ]; then printf "No arguments specified.\nUsage:\n transfer <file|directory>\n ... | transfer <file_name>\n">&2; return 1; fi; file_name=$(basename "$1"); if [ -t 0 ]; then file="$1"; if [ ! -e "$file" ]; then echo "$file: No such file or directory">&2; return 1; fi; if [ -d "$file" ]; then cd "$file" || return 1; file_name="$file_name.zip"; set -- zip -r -q - .; else set -- cat "$file"; fi; else set -- cat; fi; url=$("$@" | curl --silent --show-error --progress-bar --upload-file "-" "https://transfer.sh/$file_name"); echo "$url"; )
 ```
 
+<br />
+
 #### Now you can use transfer function
 ```
 $ transfer hello.txt
 ```
 
+<br />
 
 ### Bash and zsh (with delete url, delete token output and prompt before uploading)
 ##### Add this to .bashrc or .zshrc or its equivalent
@@ -435,10 +577,22 @@ tauN5dE3fWJe
 https://transfer.sh/MYkuqn/image.img
 ```
 
+<br />
+
+---
+
+<br />
+
 ## Contributions
 
 Contributions are welcome.
 
+<br />
+
+---
+
+<br />
+
 ## Creators
 
 **Remco Verhoef**
@@ -447,11 +601,22 @@ Contributions are welcome.
 
 **Uvis Grinfelds**
 
-## Maintainer
+<br />
+
+---
+
+<br />
+
+## Maintainers
+
+- **Andrea Spacca**
+- **Stefan Benten**
+
+<br />
 
-**Andrea Spacca**
+---
 
-**Stefan Benten**
+<br />
 
 ## Copyright and License
 

+ 1 - 1
go.mod

@@ -13,7 +13,7 @@ require (
 	github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.67
 	github.com/aws/aws-sdk-go-v2/service/s3 v1.33.1
 	github.com/dutchcoders/go-clamd v0.0.0-20170520113014-b970184f4d9e
-	github.com/dutchcoders/go-virustotal v0.0.0-20140923143438-24cc8e6fa329
+	github.com/Aetherinox/go-virustotal v0.0.0-20250520084801-0eb8c8f901c8
 	github.com/dutchcoders/transfer.sh-web v0.0.0-20221119114740-ca3a2621d2a6
 	github.com/elazarl/go-bindata-assetfs v1.0.1
 	github.com/fatih/color v1.14.1

+ 2 - 2
go.sum

@@ -81,8 +81,8 @@ github.com/dsnet/try v0.0.3 h1:ptR59SsrcFUYbT/FhAbKTV6iLkeD6O18qfIWRml2fqI=
 github.com/dsnet/try v0.0.3/go.mod h1:WBM8tRpUmnXXhY1U6/S8dt6UWdHTQ7y8A5YSkRCkq40=
 github.com/dutchcoders/go-clamd v0.0.0-20170520113014-b970184f4d9e h1:rcHHSQqzCgvlwP0I/fQ8rQMn/MpHE5gWSLdtpxtP6KQ=
 github.com/dutchcoders/go-clamd v0.0.0-20170520113014-b970184f4d9e/go.mod h1:Byz7q8MSzSPkouskHJhX0er2mZY/m0Vj5bMeMCkkyY4=
-github.com/dutchcoders/go-virustotal v0.0.0-20140923143438-24cc8e6fa329 h1:ERqCkG/uSyT74P1m/j9yR+so+7ynY4fbTvLY/Mr1ZMg=
-github.com/dutchcoders/go-virustotal v0.0.0-20140923143438-24cc8e6fa329/go.mod h1:G5qOfE5bQZ5scycLpB7fYWgN4y3xdfXo+pYWM8z2epY=
+github.com/Aetherinox/go-virustotal v0.0.0-20250520084801-0eb8c8f901c8 h1:wEwYJxNLG29OesabDdAJWFBIO42HOL4x5kjvGuZLIyk=
+github.com/Aetherinox/go-virustotal v0.0.0-20250520084801-0eb8c8f901c8/go.mod h1:myGG2GhfY2AgAPe8lFZw6Y1+IxhU+ED7ilotbpdQsDw=
 github.com/dutchcoders/transfer.sh-web v0.0.0-20221119114740-ca3a2621d2a6 h1:7uTRy44YpQi6/mtDq0N9zeQRCGEh93o7gKq/usGgpF8=
 github.com/dutchcoders/transfer.sh-web v0.0.0-20221119114740-ca3a2621d2a6/go.mod h1:F6Q37CxDh2MHr5KXkcZmNB3tdkK7v+bgE+OpBY+9ilI=
 github.com/elazarl/go-bindata-assetfs v1.0.1 h1:m0kkaHRKEu7tUIUFVwhGGGYClXvyl4RE03qmvRTNfbw=

+ 1 - 1
server/virustotal.go

@@ -30,7 +30,7 @@ import (
 
 	"github.com/gorilla/mux"
 
-	"github.com/dutchcoders/go-virustotal"
+	"github.com/Aetherinox/go-virustotal"
 )
 
 func (s *Server) virusTotalHandler(w http.ResponseWriter, r *http.Request) {