diff --git a/.github/workflows/buildx.yaml b/.github/workflows/buildx.yaml
new file mode 100644
index 0000000..1938731
--- /dev/null
+++ b/.github/workflows/buildx.yaml
@@ -0,0 +1,60 @@
+name: buildx
+
+on:
+ push:
+ tags:
+ - 'v*'
+
+jobs:
+ buildx:
+ runs-on: ubuntu-latest
+ steps:
+ -
+ name: Checkout
+ uses: actions/checkout@v2
+ -
+ name: Prepare
+ id: prepare
+ run: |
+ DOCKER_IMAGE=andreimarcu/linx-server
+ DOCKER_PLATFORMS=linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64/v8,linux/386
+ VERSION=version-${GITHUB_REF#refs/tags/v}
+ TAGS="--tag ${DOCKER_IMAGE}:${VERSION} --tag ${DOCKER_IMAGE}:latest"
+
+ echo ::set-output name=docker_image::${DOCKER_IMAGE}
+ echo ::set-output name=version::${VERSION}
+ echo ::set-output name=buildx_args::--platform ${DOCKER_PLATFORMS} \
+ --build-arg VERSION=${VERSION} \
+ --build-arg BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') \
+ --build-arg VCS_REF=${GITHUB_SHA::8} \
+ ${TAGS} --file Dockerfile .
+ -
+ name: Set up Docker Buildx
+ uses: crazy-max/ghaction-docker-buildx@v3
+ -
+ name: Docker Buildx (build)
+ run: |
+ docker buildx build --output "type=image,push=false" ${{ steps.prepare.outputs.buildx_args }}
+ -
+ name: Docker Login
+ if: success()
+ env:
+ DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+ DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+ run: |
+ echo "${DOCKER_PASSWORD}" | docker login --username "${DOCKER_USERNAME}" --password-stdin
+ -
+ name: Docker Buildx (push)
+ if: success()
+ run: |
+ docker buildx build --output "type=image,push=true" ${{ steps.prepare.outputs.buildx_args }}
+ -
+ name: Docker Check Manifest
+ if: always()
+ run: |
+ docker run --rm mplatform/mquery ${{ steps.prepare.outputs.docker_image }}:${{ steps.prepare.outputs.version }}
+ -
+ name: Clear
+ if: always()
+ run: |
+ rm -f ${HOME}/.docker/config.json
diff --git a/.gitignore b/.gitignore
index 79de414..df2bae9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,6 +20,8 @@ _cgo_defun.c
_cgo_gotypes.go
_cgo_export.*
+.DS_Store
+
_testmain.go
*.exe
@@ -27,5 +29,11 @@ _testmain.go
*.prof
linx-server
+linx-cleanup/linx-cleanup
+linx-genkey/linx-genkey
+linx-server.conf
files/
meta/
+binaries/
+custom_pages/
+authfile
diff --git a/.travis.yml b/.travis.yml
index b82869c..46278b8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
language: go
go:
- - 1.5
+ - "1.14"
before_script:
- go vet ./...
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..e9d61f2
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,28 @@
+FROM golang:1.14-alpine3.11 AS build
+
+COPY . /go/src/github.com/andreimarcu/linx-server
+WORKDIR /go/src/github.com/andreimarcu/linx-server
+
+RUN set -ex \
+ && apk add --no-cache --virtual .build-deps git \
+ && go get -v . \
+ && apk del .build-deps
+
+FROM alpine:3.11
+
+COPY --from=build /go/bin/linx-server /usr/local/bin/linx-server
+
+ENV GOPATH /go
+ENV SSL_CERT_FILE /etc/ssl/cert.pem
+
+COPY static /go/src/github.com/andreimarcu/linx-server/static/
+COPY templates /go/src/github.com/andreimarcu/linx-server/templates/
+
+RUN mkdir -p /data/files && mkdir -p /data/meta && mkdir -p /data/locks && chown -R 65534:65534 /data
+
+VOLUME ["/data/files", "/data/meta", "/data/locks"]
+
+EXPOSE 8080
+USER nobody
+ENTRYPOINT ["/usr/local/bin/linx-server", "-bind=0.0.0.0:8080", "-filespath=/data/files/", "-metapath=/data/meta/", "-lockspath=/data/locks/"]
+CMD ["-sitename=linx", "-allowhotlink"]
diff --git a/README.md b/README.md
index 98f5718..6f3b615 100644
--- a/README.md
+++ b/README.md
@@ -1,74 +1,164 @@
-
-linx-server
+linx-server
======
-[](https://travis-ci.org/andreimarcu/linx-server)
Self-hosted file/media sharing website.
+### Is this still active?
+
+Yes, though the repo may be old, it's still active and I'll try and fix any major issues that occur with my limited time.
+
+### Demo
+You can see what it looks like using the demo: [https://put.icu/](https://put.icu/)
+
+
+### Clients
+**Official**
+- CLI: **linx-client** - [Source](https://github.com/andreimarcu/linx-client)
+
+**Unofficial**
+- Android: **LinxShare** - [Source](https://github.com/iksteen/LinxShare/) | [Google Play](https://play.google.com/store/apps/details?id=org.thegraveyard.linxshare)
+- CLI: **golinx** - [Source](https://github.com/mutantmonkey/golinx)
+
### Features
- Display common filetypes (image, video, audio, markdown, pdf)
- Display syntax-highlighted code with in-place editing
-- Documented API with keys if need to restrict uploads (can use [linx-client](https://github.com/andreimarcu/linx-client) for uploading through command-line)
+- Documented API with keys for restricting uploads
- Torrent download of files using web seeding
-- File expiry, deletion key, and random filename options
+- File expiry, deletion key, file access key, and random filename options
### Screenshots
-
-
+
+
+
-Get release and run
+Getting started
-------------------
-1. Grab the latest binary from the [releases](https://github.com/andreimarcu/linx-server/releases)
-2. Run ```./linx-server...```
+
+#### Using Docker
+1. Create directories ```files``` and ```meta``` and run ```chown -R 65534:65534 meta && chown -R 65534:65534 files```
+2. Create a config file (example provided in repo), we'll refer to it as __linx-server.conf__ in the following examples
+
+
+
+Example running
+```
+docker run -p 8080:8080 -v /path/to/linx-server.conf:/data/linx-server.conf -v /path/to/meta:/data/meta -v /path/to/files:/data/files andreimarcu/linx-server -config /data/linx-server.conf
+```
+
+Example with docker-compose
+```
+version: '2.2'
+services:
+ linx-server:
+ container_name: linx-server
+ image: andreimarcu/linx-server
+ command: -config /data/linx-server.conf
+ volumes:
+ - /path/to/files:/data/files
+ - /path/to/meta:/data/meta
+ - /path/to/linx-server.conf:/data/linx-server.conf
+ network_mode: bridge
+ ports:
+ - "8080:8080"
+ restart: unless-stopped
+```
+Ideally, you would use a reverse proxy such as nginx or caddy to handle TLS certificates.
+
+#### Using a binary release
+
+1. Grab the latest binary from the [releases](https://github.com/andreimarcu/linx-server/releases), then run ```go install```
+2. Run ```linx-server -config path/to/linx-server.conf```
Usage
-----
#### Configuration
-All configuration options are accepted either as arguments or can be placed in an ini-style file as such:
+All configuration options are accepted either as arguments or can be placed in a file as such (see example file linx-server.conf.example in repo):
```ini
-sitename = "my linx"
-siteurl = "https://linx.example.com"
-remoteuploads = true
-# etc
-```
-...and then invoke ```linx-server -config path/to/config.ini```
+bind = 127.0.0.1:8080
+sitename = myLinx
+maxsize = 4294967296
+maxexpiry = 86400
+# ... etc
+```
+...and then run ```linx-server -config path/to/linx-server.conf```
-#### Common options
-- ```-bind 127.0.0.1:8080``` -- what to bind to (default is 127.0.0.1:8080)
-- ```-sitename myLinx``` -- the site name displayed on top (default is linx)
-- ```-siteurl "http://mylinx.example.org/"``` -- the site url (for generating links)
-- ```-filespath files/"``` -- Path to store uploads (default is files/)
-- ```-metapath meta/``` -- Path to store information about uploads (default is meta/)
-- ```-maxsize 4294967296``` -- maximum upload file size in bytes (default 4GB)
-- ```-allowhotlink``` -- Allow file hotlinking
-- ```-contentsecuritypolicy "..."``` -- Content-Security-Policy header for pages (default is "default-src 'self'; img-src 'self' data:; style-src 'self' 'unsafe-inline'; referrer origin;")
-- ```-filecontentsecuritypolicy "..."``` -- Content-Security-Policy header for files (default is "default-src 'none'; img-src 'self'; object-src 'self'; media-src 'self'; referrer origin;")
-- ```-xframeoptions "..." ``` -- X-Frame-Options header (default is "SAMEORIGIN")
-- ```-remoteuploads``` -- (optionally) enable remote uploads (/upload?url=https://...)
-- ```-nologs``` -- (optionally) disable request logs in stdout
+#### Options
-#### SSL with built-in server
-- ```-certfile path/to/your.crt``` -- Path to the ssl certificate (required if you want to use the https server)
-- ```-keyfile path/to/your.key``` -- Path to the ssl key (required if you want to use the https server)
+|Option|Description
+|------|-----------
+| ```bind = 127.0.0.1:8080``` | what to bind to (default is 127.0.0.1:8080)
+| ```sitename = myLinx``` | the site name displayed on top (default is inferred from Host header)
+| ```siteurl = https://mylinx.example.org/``` | the site url (default is inferred from execution context)
+| ```selifpath = selif``` | path relative to site base url (the "selif" in mylinx.example.org/selif/image.jpg) where files are accessed directly (default: selif)
+| ```maxsize = 4294967296``` | maximum upload file size in bytes (default 4GB)
+| ```maxexpiry = 86400``` | maximum expiration time in seconds (default is 0, which is no expiry)
+| ```allowhotlink = true``` | Allow file hotlinking
+| ```contentsecuritypolicy = "..."``` | Content-Security-Policy header for pages (default is "default-src 'self'; img-src 'self' data:; style-src 'self' 'unsafe-inline'; frame-ancestors 'self';")
+| ```filecontentsecuritypolicy = "..."``` | Content-Security-Policy header for files (default is "default-src 'none'; img-src 'self'; object-src 'self'; media-src 'self'; style-src 'self' 'unsafe-inline'; frame-ancestors 'self';")
+| ```refererpolicy = "..."``` | Referrer-Policy header for pages (default is "same-origin")
+| ```filereferrerpolicy = "..."``` | Referrer-Policy header for files (default is "same-origin")
+| ```xframeoptions = "..." ``` | X-Frame-Options header (default is "SAMEORIGIN")
+| ```remoteuploads = true``` | (optionally) enable remote uploads (/upload?url=https://...)
+| ```nologs = true``` | (optionally) disable request logs in stdout
+| ```force-random-filename = true``` | (optionally) force the use of random filenames
+| ```custompagespath = custom_pages/``` | (optionally) specify path to directory containing markdown pages (must end in .md) that will be added to the site navigation (this can be useful for providing contact/support information and so on). For example, custom_pages/My_Page.md will become My Page in the site navigation
+| ```extra-footer-text = "..."``` | (optionally) Extra text above the footer for notices.
+| ```max-duration-time = 0``` | Time till expiry for files over max-duration-size. (Default is 0 for no-expiry.)
+| ```max-duration-size = 4294967296``` | Size of file before max-duration-time is used to determine expiry max time. (Default is 4GB)
+| ```disable-access-key = true``` | Disables access key usage. (Default is false.)
+| ```default-random-filename = true``` | Makes it so the random filename is not default if set false. (Default is true.)
-#### Use with http proxy
-- ```-realip``` -- let linx-server know you (nginx, etc) are providing the X-Real-IP and/or X-Forwarded-For headers.
-#### Use with fastcgi
-- ```-fastcgi``` -- serve through fastcgi
+#### Cleaning up expired files
+When files expire, access is disabled immediately, but the files and metadata
+will persist on disk until someone attempts to access them. You can set the following option to run cleanup every few minutes. This can also be done using a separate utility found the linx-cleanup directory.
+
+
+|Option|Description
+|------|-----------
+| ```cleanup-every-minutes = 5``` | How often to clean up expired files in minutes (default is 0, which means files will be cleaned up as they are accessed)
+
#### Require API Keys for uploads
-- ```-authfile path/to/authfile``` -- (optionally) require authorization for upload/delete by providing a newline-separated file of scrypted auth keys
-- ```-remoteauthfile path/to/remoteauthfile``` -- (optionally) require authorization for remote uploads by providing a newline-separated file of scrypted auth keys
+
+|Option|Description
+|------|-----------
+| ```authfile = path/to/authfile``` | (optionally) require authorization for upload/delete by providing a newline-separated file of scrypted auth keys
+| ```remoteauthfile = path/to/remoteauthfile``` | (optionally) require authorization for remote uploads by providing a newline-separated file of scrypted auth keys
+| ```basicauth = true``` | (optionally) allow basic authorization to upload or paste files from browser when `-authfile` is enabled. When uploading, you will be prompted to enter a user and password - leave the user blank and use your auth key as the password
A helper utility ```linx-genkey``` is provided which hashes keys to the format required in the auth files.
+#### Storage backends
+The following storage backends are available:
+
+|Name|Notes|Options
+|----|-----|-------
+|LocalFS|Enabled by default, this backend uses the filesystem|```filespath = files/``` -- Path to store uploads (default is files/) ```metapath = meta/``` -- Path to store information about uploads (default is meta/)|
+|S3|Use with any S3-compatible provider. This implementation will stream files through the linx instance (every download will request and stream the file from the S3 bucket). File metadata will be stored as tags on the object in the bucket.
For high-traffic environments, one might consider using an external caching layer such as described [in this article](https://blog.sentry.io/2017/03/01/dodging-s3-downtime-with-nginx-and-haproxy.html).|```s3-endpoint = https://...``` -- S3 endpoint ```s3-region = us-east-1``` -- S3 region ```s3-bucket = mybucket``` -- S3 bucket to use for files and metadata ```s3-force-path-style = true``` (optional) -- force path-style addresing (e.g. https://s3.amazonaws.com/linx/example.txt)