Compare commits
No commits in common. "master" and "v23.21.3" have entirely different histories.
11
Makefile
11
Makefile
@ -5,9 +5,8 @@ SYSDDIR_=${shell pkg-config systemd --variable=systemdsystemunitdir}
|
||||
SYSDDIR=${SYSDDIR_:/%=%}
|
||||
DESTDIR=/
|
||||
|
||||
VERSION=23.34.0
|
||||
VERSION=23.21.3
|
||||
|
||||
FLAGS=-trimpath -mod=readonly -modcacherw
|
||||
LDFLAGS=-ldflags "-s -w -X main.version=${VERSION}" -tags osusergo,netgo
|
||||
|
||||
all: web/*.jade.go ${TARGET}
|
||||
@ -15,8 +14,8 @@ all: web/*.jade.go ${TARGET}
|
||||
.PHONY: ${TARGET}
|
||||
|
||||
${TARGET}:
|
||||
go build -o bin/$@ ${FLAGS} ${LDFLAGS} cmd/$@/main.go
|
||||
go build -o bin/$@-clean ${FLAGS} ${LDFLAGS} cmd/$@-clean/main.go
|
||||
go build -o bin/$@ ${LDFLAGS} cmd/$@/main.go
|
||||
go build -o bin/$@-clean ${LDFLAGS} cmd/$@-clean/main.go
|
||||
|
||||
web/*.jade.go: web/templates/*.jade
|
||||
go install github.com/Joker/jade/cmd/jade@latest
|
||||
@ -33,6 +32,8 @@ install:
|
||||
install -Dm 0644 init/systemd/${TARGET}-clean.timer ${DESTDIR}${SYSDDIR}/${TARGET}-clean.timer
|
||||
install -Dm 0644 init/systemd/${TARGET}-clean.service ${DESTDIR}${SYSDDIR}/${TARGET}-clean.service
|
||||
|
||||
install -Dm 0644 build/dwelling-upload.conf ${DESTDIR}usr/lib/sysusers.d/dwelling-upload.conf
|
||||
|
||||
uninstall:
|
||||
rm ${DESTDIR}usr/bin/${TARGET}
|
||||
rm ${DESTDIR}usr/bin/${TARGET}-clean
|
||||
@ -43,6 +44,8 @@ uninstall:
|
||||
rm ${DESTDIR}${SYSDDIR}/${TARGET}-clean.timer
|
||||
rm ${DESTDIR}${SYSDDIR}/${TARGET}-clean.service
|
||||
|
||||
rm ${DESTDIR}usr/lib/sysusers.d/dwelling-upload.conf
|
||||
|
||||
clean:
|
||||
rm -f web/*.jade.go
|
||||
go clean
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
# Maintainer: Alexander "Arav" Andreev <me@arav.su>
|
||||
pkgname=dwelling-upload
|
||||
pkgver=23.34.0
|
||||
pkgver=23.21.3
|
||||
pkgrel=1
|
||||
pkgdesc="Arav's Dwelling / Upload"
|
||||
arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h' 'aarch64')
|
||||
@ -14,11 +14,9 @@ md5sums=('SKIP')
|
||||
|
||||
build() {
|
||||
cd "$srcdir/$pkgname"
|
||||
|
||||
export GOPATH="$srcdir"/gopath
|
||||
export CGO_CPPFLAGS="${CPPFLAGS}"
|
||||
export CGO_CFLAGS="${CFLAGS}"
|
||||
export CGO_CXXFLAGS="${CXXFLAGS}"
|
||||
export CGO_LDFLAGS="${LDFLAGS}"
|
||||
|
||||
make VERSION=$pkgver DESTDIR="$pkgdir/"
|
||||
}
|
||||
|
||||
|
||||
4
build/dwelling-upload.conf
Normal file
4
build/dwelling-upload.conf
Normal file
@ -0,0 +1,4 @@
|
||||
# sysusers.d
|
||||
g dwupload - -
|
||||
u dwupload - -
|
||||
m dwupload dwupload
|
||||
@ -3,6 +3,7 @@ package main
|
||||
import (
|
||||
"flag"
|
||||
"fmt"
|
||||
"io/ioutil"
|
||||
"log"
|
||||
"os"
|
||||
"path"
|
||||
@ -10,10 +11,10 @@ import (
|
||||
)
|
||||
|
||||
var (
|
||||
uploadDir = flag.String("dir", "/srv/upload", "path to a directory where uploaded files are stored")
|
||||
expiry = flag.Duration("expiry", 36*time.Hour, "keep files for this much hours")
|
||||
uploadDir *string = flag.String("upload-dir", "/srv/upload", "path to a directory where uploaded files are stored")
|
||||
keepForHours *int64 = flag.Int64("keep-for", 36, "keep files for this much hours")
|
||||
|
||||
showVersion = flag.Bool("v", false, "show version")
|
||||
showVersion *bool = flag.Bool("v", false, "show version")
|
||||
)
|
||||
|
||||
var version string
|
||||
@ -27,21 +28,15 @@ func main() {
|
||||
return
|
||||
}
|
||||
|
||||
uploadsDir, err := os.ReadDir(*uploadDir)
|
||||
uploadsDir, err := ioutil.ReadDir(*uploadDir)
|
||||
if err != nil {
|
||||
log.Fatalf("failed to open a directory %s: %s\n", *uploadDir, err)
|
||||
log.Fatalf("failed to open directory %s: %s\n", *uploadDir, err)
|
||||
}
|
||||
|
||||
for _, entry := range uploadsDir {
|
||||
file, err := os.Stat(path.Join(*uploadDir, entry.Name()))
|
||||
if err != nil {
|
||||
log.Printf("failed to stat a file %s: %s", entry.Name(), err)
|
||||
continue
|
||||
}
|
||||
|
||||
if time.Now().UTC().Sub(file.ModTime().UTC()) >= *expiry {
|
||||
if time.Now().UTC().Sub(entry.ModTime().UTC()) >= time.Duration(*keepForHours)*time.Hour {
|
||||
if err := os.Remove(path.Join(*uploadDir, entry.Name())); err != nil {
|
||||
log.Printf("failed to remove a file %s: %s", entry.Name(), err)
|
||||
log.Printf("failed to remove file %s: %s", entry.Name(), err)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,28 +1,30 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
duihttp "dwelling-upload/internal/http"
|
||||
"dwelling-upload/internal/http"
|
||||
"dwelling-upload/pkg/utils"
|
||||
"dwelling-upload/pkg/watcher"
|
||||
"dwelling-upload/web"
|
||||
"flag"
|
||||
"fmt"
|
||||
"log"
|
||||
"net/http"
|
||||
nethttp "net/http"
|
||||
"net/netip"
|
||||
"os"
|
||||
"os/signal"
|
||||
"path"
|
||||
"strings"
|
||||
"syscall"
|
||||
|
||||
"git.arav.su/Arav/httpr"
|
||||
)
|
||||
|
||||
var (
|
||||
listenAddress = flag.String("listen", "/var/run/dwelling-upload/sock", "listen address (ip:port|unix_path)")
|
||||
uploadDir = flag.String("dir", "/srv/upload", "directory where uploaded files are stored")
|
||||
expiry = flag.Int("expiry", 36, "keep files for this much hours")
|
||||
storageSize = flag.Int64("storage", 102400, "storage size in MiB for uploads")
|
||||
fileSize = flag.Int64("file", 128, "max. size in MiB for files")
|
||||
listenAddress *string = flag.String("listen", "/var/run/dwelling-upload/sock", "listen address (ip:port|unix_path)")
|
||||
uploadDir *string = flag.String("upload-dir", "/srv/upload", "directory where uploaded files are stored")
|
||||
keepForHours *int = flag.Int("keep-for", 36, "keep files for this much hours")
|
||||
storageSize *int64 = flag.Int64("storage", 102400, "storage size in MiB for uploads")
|
||||
fileSizeLimit *int64 = flag.Int64("file-size", 128, "max. size in MiB for files")
|
||||
|
||||
showVersion *bool = flag.Bool("v", false, "show version")
|
||||
)
|
||||
@ -38,6 +40,36 @@ func main() {
|
||||
return
|
||||
}
|
||||
|
||||
var network string
|
||||
if !strings.ContainsRune(*listenAddress, ':') {
|
||||
network = "unix"
|
||||
defer os.Remove(*listenAddress)
|
||||
} else {
|
||||
ap, err := netip.ParseAddrPort(*listenAddress)
|
||||
if err != nil {
|
||||
log.Fatalln(err)
|
||||
}
|
||||
|
||||
if ap.Addr().Is4() {
|
||||
network = "tcp4"
|
||||
} else {
|
||||
network = "tcp6"
|
||||
}
|
||||
}
|
||||
|
||||
watcha, err := watcher.NewInotifyWatcher()
|
||||
if err != nil {
|
||||
log.Fatalln(err)
|
||||
}
|
||||
defer watcha.Close()
|
||||
|
||||
if err := watcha.AddWatch(*uploadDir, watcher.CrDelMask); err != nil {
|
||||
log.Fatalln(err)
|
||||
}
|
||||
|
||||
uploadDirNotify := make(chan uint32)
|
||||
go watcha.WatchForMask(uploadDirNotify, watcher.CrDelMask)
|
||||
|
||||
hashSalt, err := os.ReadFile(path.Join(os.Getenv("CREDENTIALS_DIRECTORY"), "salt"))
|
||||
if err != nil {
|
||||
log.Fatalln("failed to read hash salt file:", err)
|
||||
@ -58,52 +90,39 @@ func main() {
|
||||
log.Fatalf("failed to get initial size of %s: %s", *uploadDir, err)
|
||||
}
|
||||
|
||||
hand := duihttp.NewUploadHandlers(logFile, *uploadDir, &uploadDirSize, string(hashSalt),
|
||||
*expiry, *storageSize, *fileSize)
|
||||
hand := http.NewUploadHandlers(logFile, *uploadDir, &uploadDirSize, string(hashSalt),
|
||||
*keepForHours, *storageSize, *fileSizeLimit)
|
||||
|
||||
r := httpr.New()
|
||||
|
||||
r.NotFoundHandler = func(w http.ResponseWriter, r *http.Request) {
|
||||
duihttp.Error(w, r, "", http.StatusNotFound)
|
||||
r.NotFoundHandler = func(w nethttp.ResponseWriter, r *nethttp.Request) {
|
||||
http.Error(w, r, nethttp.StatusNotFound, "")
|
||||
}
|
||||
|
||||
r.Handler(http.MethodGet, "/", hand.Index)
|
||||
r.Handler(http.MethodPost, "/", hand.Upload)
|
||||
r.Handler(http.MethodGet, "/:hash/:name", hand.Download)
|
||||
r.Handler(http.MethodPost, "/delete", hand.Delete)
|
||||
r.Handler(http.MethodDelete, "/:hash", hand.Delete)
|
||||
r.Handler(nethttp.MethodGet, "/", hand.Index)
|
||||
r.Handler(nethttp.MethodPost, "/", hand.Upload)
|
||||
r.Handler(nethttp.MethodGet, "/:hash/:name", hand.Download)
|
||||
r.Handler(nethttp.MethodPost, "/delete", hand.Delete)
|
||||
r.Handler(nethttp.MethodDelete, "/:hash", hand.Delete)
|
||||
|
||||
r.ServeStatic("/assets/*filepath", web.Assets())
|
||||
r.Handler(http.MethodGet, "/robots.txt", duihttp.RobotsTxt)
|
||||
r.Handler(http.MethodGet, "/favicon.svg", duihttp.Favicon)
|
||||
r.Handler(nethttp.MethodGet, "/robots.txt", http.RobotsTxt)
|
||||
r.Handler(nethttp.MethodGet, "/favicon.svg", http.Favicon)
|
||||
|
||||
srv := duihttp.NewHttpServer(r)
|
||||
|
||||
if err := srv.Start(*listenAddress); err != nil {
|
||||
log.Fatalln("failed to start a server:", err)
|
||||
}
|
||||
srv := http.NewHttpServer(r)
|
||||
defer func() {
|
||||
if err := srv.Stop(); err != nil {
|
||||
log.Fatalln("failed to properly shutdown a server:", err)
|
||||
}
|
||||
}()
|
||||
|
||||
if err := srv.Start(network, *listenAddress); err != nil {
|
||||
log.Fatalln("failed to start a server:", err)
|
||||
}
|
||||
|
||||
doneSignal := make(chan os.Signal, 1)
|
||||
signal.Notify(doneSignal, os.Interrupt, syscall.SIGINT, syscall.SIGTERM)
|
||||
|
||||
watcha, err := watcher.NewInotifyWatcher()
|
||||
if err != nil {
|
||||
log.Fatalln(err)
|
||||
}
|
||||
defer watcha.Close()
|
||||
|
||||
if err := watcha.AddWatch(*uploadDir, watcher.CrDelMask); err != nil {
|
||||
log.Fatalln(err)
|
||||
}
|
||||
|
||||
uploadDirNotify := make(chan uint32)
|
||||
go watcha.WatchForMask(uploadDirNotify, watcher.CrDelMask)
|
||||
|
||||
go func() {
|
||||
for {
|
||||
select {
|
||||
|
||||
@ -1,22 +1,22 @@
|
||||
server {
|
||||
listen 443 ssl http2;
|
||||
listen 8094; # Tor I2P
|
||||
# listen 8094; # Tor
|
||||
listen 127.0.0.1:8114; # I2P
|
||||
listen [300:a98d:d6d0:8a08::c]:80; # Yggdrasil
|
||||
|
||||
server_name upload.arav.su upload.arav.i2p 4usftbmjpfexkr2x5xbp5ukmygpmg4fgrnx2wbifsexqctooz5hmviyd.onion;
|
||||
|
||||
server_name upload.arav.su upload.arav.i2p;
|
||||
access_log /var/log/nginx/dwelling/upload.log main if=$nolog;
|
||||
|
||||
ssl_certificate /etc/letsencrypt/live/arav.su/fullchain.pem;
|
||||
ssl_certificate_key /etc/letsencrypt/live/arav.su/privkey.pem;
|
||||
|
||||
|
||||
add_header Content-Security-Policy "default-src 'self'; script-src 'none'; style-src 'self'; img-src 'self'; media-src 'self'; object-src 'none'; frame-src 'none'; frame-ancestors 'none'; font-src 'self'; form-action 'self'";
|
||||
add_header Content-Security-Policy "default-src 'self'; script-src 'none'; style-src 'self' 'unsafe-inline'; img-src 'self'; media-src 'self'; object-src 'none'; frame-src 'none'; frame-ancestors 'none'; font-src 'self'; form-action 'self'";
|
||||
add_header X-Frame-Options "DENY";
|
||||
add_header X-Content-Type-Options "nosniff";
|
||||
add_header X-XSS-Protection "1; mode=block";
|
||||
add_header Strict-Transport-Security "max-age=31536000; includeSubDomains; preload";
|
||||
add_header Onion-Location "http://4usftbmjpfexkr2x5xbp5ukmygpmg4fgrnx2wbifsexqctooz5hmviyd.onion$request_uri";
|
||||
# add_header Onion-Location "http://.onion$request_uri";
|
||||
|
||||
|
||||
location / {
|
||||
|
||||
2
go.mod
2
go.mod
@ -4,4 +4,4 @@ go 1.17
|
||||
|
||||
require github.com/pkg/errors v0.9.1
|
||||
|
||||
require git.arav.su/Arav/httpr v0.3.1
|
||||
require git.arav.su/Arav/httpr v0.2.0
|
||||
|
||||
4
go.sum
4
go.sum
@ -1,4 +1,4 @@
|
||||
git.arav.su/Arav/httpr v0.3.1 h1:8ba90SJ4XYUWfIlC3V0Zuw3+CcOb9IYVkOZ/2mB9JO0=
|
||||
git.arav.su/Arav/httpr v0.3.1/go.mod h1:z0SVYwe5dBReeVuFU9QH2PmBxICJwchxqY5OfZbeVzU=
|
||||
git.arav.su/Arav/httpr v0.2.0 h1:rtwUVl4ZDfvMf9DeLktxvups5GDY0ARVcUuUHR7Eb9E=
|
||||
git.arav.su/Arav/httpr v0.2.0/go.mod h1:z0SVYwe5dBReeVuFU9QH2PmBxICJwchxqY5OfZbeVzU=
|
||||
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
|
||||
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
|
||||
|
||||
@ -3,8 +3,9 @@ Description=dwelling-upload-clean
|
||||
|
||||
[Service]
|
||||
Type=oneshot
|
||||
DynamicUser=yes
|
||||
ExecStart=/usr/bin/dwelling-upload-clean -dir /srv/upload -expiry 36h
|
||||
User=dwupload
|
||||
Group=dwupload
|
||||
ExecStart=/usr/bin/dwelling-upload-clean -upload-dir /srv/upload -keep-for 36
|
||||
|
||||
ReadOnlyPaths=/
|
||||
# Set here path to directory where uploads are stored.
|
||||
@ -19,33 +20,18 @@ LockPersonality=true
|
||||
MemoryDenyWriteExecute=true
|
||||
NoNewPrivileges=true
|
||||
PrivateDevices=true
|
||||
PrivateTmp=true
|
||||
PrivateUsers=true
|
||||
ProcSubset=pid
|
||||
ProtectClock=true
|
||||
ProtectControlGroups=true
|
||||
ProtectHome=true
|
||||
ProtectHostname=true
|
||||
ProtectKernelLogs=true
|
||||
ProtectKernelModules=true
|
||||
ProtectKernelTunables=true
|
||||
ProtectProc=noaccess
|
||||
ProtectSystem=strict
|
||||
RestrictAddressFamilies=AF_INET AF_INET6 AF_UNIX
|
||||
RestrictAddressFamilies=
|
||||
RestrictNamespaces=true
|
||||
RestrictRealtime=true
|
||||
RestrictSUIDSGID=true
|
||||
SystemCallArchitectures=native
|
||||
SystemCallFilter=~@clock
|
||||
SystemCallFilter=~@cpu-emulation
|
||||
SystemCallFilter=~@debug
|
||||
SystemCallFilter=~@module
|
||||
SystemCallFilter=~@mount
|
||||
SystemCallFilter=~@obsolete
|
||||
SystemCallFilter=~@privileged
|
||||
SystemCallFilter=~@raw-io
|
||||
SystemCallFilter=~@reboot
|
||||
SystemCallFilter=~@swap
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
|
||||
@ -5,9 +5,10 @@ After=network.target
|
||||
[Service]
|
||||
Type=simple
|
||||
Restart=on-failure
|
||||
DynamicUser=yes
|
||||
ExecStart=/usr/bin/dwelling-upload -listen /var/run/dwelling-upload/sock \
|
||||
-dir /srv/upload -expiry 36 -storage 102400 -file 128
|
||||
User=dwupload
|
||||
Group=dwupload
|
||||
ExecStart=/usr/bin/dwelling-upload -listen /var/run/dwelling-upload/sock -upload-dir /srv/upload \
|
||||
-keep-for 36 -storage 102400 -file-size 128
|
||||
|
||||
ReadOnlyPaths=/
|
||||
# Set here path to directory where uploads are stored.
|
||||
@ -28,33 +29,18 @@ LockPersonality=true
|
||||
MemoryDenyWriteExecute=true
|
||||
NoNewPrivileges=true
|
||||
PrivateDevices=true
|
||||
PrivateTmp=true
|
||||
PrivateUsers=true
|
||||
ProcSubset=pid
|
||||
ProtectClock=true
|
||||
ProtectControlGroups=true
|
||||
ProtectHome=true
|
||||
ProtectHostname=true
|
||||
ProtectKernelLogs=true
|
||||
ProtectKernelModules=true
|
||||
ProtectKernelTunables=true
|
||||
ProtectProc=noaccess
|
||||
ProtectSystem=strict
|
||||
RestrictAddressFamilies=AF_INET AF_INET6 AF_UNIX
|
||||
RestrictNamespaces=true
|
||||
RestrictRealtime=true
|
||||
RestrictSUIDSGID=true
|
||||
SystemCallArchitectures=native
|
||||
SystemCallFilter=~@clock
|
||||
SystemCallFilter=~@cpu-emulation
|
||||
SystemCallFilter=~@debug
|
||||
SystemCallFilter=~@module
|
||||
SystemCallFilter=~@mount
|
||||
SystemCallFilter=~@obsolete
|
||||
SystemCallFilter=~@privileged
|
||||
SystemCallFilter=~@raw-io
|
||||
SystemCallFilter=~@reboot
|
||||
SystemCallFilter=~@swap
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
|
||||
@ -48,10 +48,12 @@ func (h *UploadHandlers) Index(w http.ResponseWriter, r *http.Request) {
|
||||
var storCapacity int64 = h.limitStorage << 20
|
||||
var fMaxSize int64 = h.limitFileSize << 20
|
||||
|
||||
_, _, capStr := utils.ConvertFileSize(storCapacity)
|
||||
_, _, usedStr := utils.ConvertFileSize(*h.uploadDirSize)
|
||||
_, _, availStr := utils.ConvertFileSize(storCapacity - *h.uploadDirSize)
|
||||
_, _, fMaxSzStr := utils.ConvertFileSize(fMaxSize)
|
||||
|
||||
web.Index(utils.MainSite(r.Host), h.keepForHours, fMaxSzStr, availStr, w)
|
||||
web.Index(utils.MainSite(r.Host), storCapacity, *h.uploadDirSize, h.keepForHours, fMaxSzStr, usedStr, capStr, availStr, w)
|
||||
}
|
||||
|
||||
func (h *UploadHandlers) Upload(w http.ResponseWriter, r *http.Request) {
|
||||
@ -62,14 +64,14 @@ func (h *UploadHandlers) Upload(w http.ResponseWriter, r *http.Request) {
|
||||
|
||||
if err := r.ParseMultipartForm(fMaxSizeBytes); err != nil {
|
||||
log.Println("failed to parse upload form:", err)
|
||||
Error(w, r, "Failed to parse upload form.", http.StatusExpectationFailed)
|
||||
Error(w, r, http.StatusExpectationFailed, "Failed to parse upload form.")
|
||||
return
|
||||
}
|
||||
|
||||
f, fHandler, err := r.FormFile("file")
|
||||
if err != nil {
|
||||
log.Println("failed to open incoming file:", err)
|
||||
Error(w, r, "Error reading an incoming file.", http.StatusInternalServerError)
|
||||
Error(w, r, http.StatusInternalServerError, "Error reading an incoming file.")
|
||||
return
|
||||
}
|
||||
defer os.Remove(fHandler.Filename)
|
||||
@ -79,20 +81,23 @@ func (h *UploadHandlers) Upload(w http.ResponseWriter, r *http.Request) {
|
||||
|
||||
if leftSpace < fHandler.Size {
|
||||
log.Println("not enough space left in storage, only", leftSpace>>20, "MiB left")
|
||||
Error(w, r, "Not enough space left, sorry.", http.StatusInternalServerError)
|
||||
if strings.Contains(r.UserAgent(), "curl") || strings.Contains(r.UserAgent(), "Wget") {
|
||||
http.Error(w, "Not enough space left, sorry", http.StatusInternalServerError)
|
||||
} else {
|
||||
web.ErrorNoSpace(utils.MainSite(r.Host), w)
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
s256 := sha256.New()
|
||||
if _, err := io.Copy(s256, f); err != nil {
|
||||
log.Println("failed to compute a SHA-256 hash:", err)
|
||||
Error(w, r, "A hash for the file cannot be computed.", http.StatusInternalServerError)
|
||||
Error(w, r, http.StatusInternalServerError, "A hash for the file cannot be computed.")
|
||||
return
|
||||
}
|
||||
|
||||
fHash := hex.EncodeToString(s256.Sum(nil))
|
||||
s256.Write([]byte(h.hashSalt))
|
||||
s256.Write([]byte(time.Now().String()))
|
||||
fSaltedHash := base64.RawURLEncoding.EncodeToString(s256.Sum(nil))
|
||||
|
||||
f.Seek(0, io.SeekStart)
|
||||
@ -104,7 +109,7 @@ func (h *UploadHandlers) Upload(w http.ResponseWriter, r *http.Request) {
|
||||
fDst, err := os.Create(fPath)
|
||||
if err != nil {
|
||||
log.Println("failed to open file for writing", err)
|
||||
Error(w, r, "File cannot be written.", http.StatusInternalServerError)
|
||||
Error(w, r, http.StatusInternalServerError, "File cannot be written.")
|
||||
return
|
||||
}
|
||||
defer fDst.Close()
|
||||
@ -117,20 +122,17 @@ func (h *UploadHandlers) Upload(w http.ResponseWriter, r *http.Request) {
|
||||
fDst.Write([]byte{0})
|
||||
fDst.Seek(0, io.SeekStart)
|
||||
|
||||
if _, err = io.Copy(fDst, f); err != nil {
|
||||
_, err = io.Copy(fDst, f)
|
||||
if err != nil {
|
||||
log.Println("failed to copy uploaded file to destination:", err)
|
||||
Error(w, r, "Failed to copy uploaded file to the storage.", http.StatusInternalServerError)
|
||||
Error(w, r, http.StatusInternalServerError, "Failed to copy uploaded file to the storage.")
|
||||
return
|
||||
}
|
||||
|
||||
typ, _ := utils.NetworkType(r.Host)
|
||||
ip := r.Header.Get("X-Real-IP")
|
||||
if typ != "www" && typ != "ygg" {
|
||||
ip = ""
|
||||
}
|
||||
|
||||
h.logFile.Printf("| up | %s | %s | %s | SHA256 %s | %s | %d | %s",
|
||||
ip, typ, fHandler.Filename, fHash, fSaltedHash, fHandler.Size, r.UserAgent())
|
||||
h.logFile.Printf("| up | %s | %s | %s | SHA256 %s | %s | %d | %s", r.Header.Get("X-Real-IP"), typ,
|
||||
fHandler.Filename, fHash, fSaltedHash, fHandler.Size, r.UserAgent())
|
||||
|
||||
w.WriteHeader(http.StatusCreated)
|
||||
} else {
|
||||
@ -158,7 +160,7 @@ func (h *UploadHandlers) Download(w http.ResponseWriter, r *http.Request) {
|
||||
|
||||
stat, err := os.Stat(path)
|
||||
if os.IsNotExist(err) {
|
||||
Error(w, r, "", http.StatusNotFound)
|
||||
Error(w, r, http.StatusNotFound, "")
|
||||
return
|
||||
}
|
||||
|
||||
@ -169,19 +171,14 @@ func (h *UploadHandlers) Download(w http.ResponseWriter, r *http.Request) {
|
||||
fd, err := os.Open(path)
|
||||
if err != nil {
|
||||
log.Println("failed to open file to read:", err)
|
||||
Error(w, r, "Failed to open file to read.", http.StatusInternalServerError)
|
||||
Error(w, r, http.StatusInternalServerError, "Failed to open file to read.")
|
||||
return
|
||||
}
|
||||
defer fd.Close()
|
||||
|
||||
typ, _ := utils.NetworkType(r.Host)
|
||||
ip := r.Header.Get("X-Real-IP")
|
||||
if typ != "www" && typ != "ygg" {
|
||||
ip = ""
|
||||
}
|
||||
netTyp, _ := utils.NetworkType(r.Host)
|
||||
|
||||
h.logFile.Printf("| dw | %s | %s | %s | %s | %s",
|
||||
ip, typ, name, saltedHash, r.UserAgent())
|
||||
h.logFile.Printf("| dw | %s | %s | %s | %s | %s", r.Header.Get("X-Real-IP"), netTyp, name, saltedHash, r.UserAgent())
|
||||
|
||||
http.ServeContent(w, r, path, stat.ModTime(), fd)
|
||||
}
|
||||
@ -197,25 +194,22 @@ func (h *UploadHandlers) Delete(w http.ResponseWriter, r *http.Request) {
|
||||
|
||||
path := path.Join(h.uploadDir, saltedHash)
|
||||
|
||||
if _, err := os.Stat(path); os.IsNotExist(err) {
|
||||
Error(w, r, "", http.StatusNotFound)
|
||||
_, err := os.Stat(path)
|
||||
if os.IsNotExist(err) {
|
||||
Error(w, r, http.StatusNotFound, "")
|
||||
return
|
||||
}
|
||||
|
||||
if err := os.Remove(path); err != nil {
|
||||
err = os.Remove(path)
|
||||
if err != nil {
|
||||
log.Println("failed to remove a file:", err)
|
||||
Error(w, r, "Failed to remove a file.", http.StatusInternalServerError)
|
||||
Error(w, r, http.StatusInternalServerError, "Failed to remove a file.")
|
||||
return
|
||||
}
|
||||
|
||||
typ, _ := utils.NetworkType(r.Host)
|
||||
ip := r.Header.Get("X-Real-IP")
|
||||
if typ != "www" && typ != "ygg" {
|
||||
ip = ""
|
||||
}
|
||||
netTyp, _ := utils.NetworkType(r.Host)
|
||||
|
||||
h.logFile.Printf("| dt | %s | %s | %s | %s",
|
||||
ip, typ, saltedHash, r.UserAgent())
|
||||
h.logFile.Printf("| dt | %s | %s | %s | %s", r.Header.Get("X-Real-IP"), netTyp, saltedHash, r.UserAgent())
|
||||
|
||||
if strings.Contains(r.UserAgent(), "curl") || strings.Contains(r.UserAgent(), "Wget") {
|
||||
fmt.Fprintln(w, "File was successfully deleted.")
|
||||
@ -224,13 +218,12 @@ func (h *UploadHandlers) Delete(w http.ResponseWriter, r *http.Request) {
|
||||
}
|
||||
}
|
||||
|
||||
func Error(w http.ResponseWriter, r *http.Request, reason string, code int) {
|
||||
func Error(w http.ResponseWriter, r *http.Request, code int, reason string) {
|
||||
if strings.Contains(r.UserAgent(), "curl") || strings.Contains(r.UserAgent(), "Wget") {
|
||||
http.Error(w, reason, code)
|
||||
return
|
||||
}
|
||||
|
||||
w.WriteHeader(code)
|
||||
web.ErrorXXX(utils.MainSite(r.Host), code, reason, w)
|
||||
}
|
||||
|
||||
|
||||
@ -5,15 +5,12 @@ import (
|
||||
"log"
|
||||
"net"
|
||||
"net/http"
|
||||
"net/netip"
|
||||
"os"
|
||||
"strings"
|
||||
"time"
|
||||
)
|
||||
|
||||
type HttpServer struct {
|
||||
s http.Server
|
||||
addr net.Addr
|
||||
s http.Server
|
||||
}
|
||||
|
||||
func NewHttpServer(r http.Handler) *HttpServer {
|
||||
@ -23,23 +20,7 @@ func NewHttpServer(r http.Handler) *HttpServer {
|
||||
Handler: r}}
|
||||
}
|
||||
|
||||
func (s *HttpServer) Start(address string) error {
|
||||
var network string
|
||||
if !strings.ContainsRune(address, ':') {
|
||||
network = "unix"
|
||||
} else {
|
||||
ap, err := netip.ParseAddrPort(address)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if ap.Addr().Is4() {
|
||||
network = "tcp4"
|
||||
} else if ap.Addr().Is6() {
|
||||
network = "tcp6"
|
||||
}
|
||||
}
|
||||
|
||||
func (s *HttpServer) Start(network, address string) error {
|
||||
listener, err := net.Listen(network, address)
|
||||
if err != nil {
|
||||
return err
|
||||
@ -49,8 +30,6 @@ func (s *HttpServer) Start(address string) error {
|
||||
os.Chmod(address, 0777)
|
||||
}
|
||||
|
||||
s.addr = listener.Addr()
|
||||
|
||||
go func() {
|
||||
if err = s.s.Serve(listener); err != nil && err != http.ErrServerClosed {
|
||||
log.Fatalln(err)
|
||||
@ -64,10 +43,6 @@ func (s *HttpServer) Stop() error {
|
||||
ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
|
||||
defer cancel()
|
||||
|
||||
if s.addr.Network() == "unix" {
|
||||
defer os.Remove(s.addr.String())
|
||||
}
|
||||
|
||||
if err := s.s.Shutdown(ctx); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
@ -25,8 +25,6 @@ func NetworkType(host string) (string, string) {
|
||||
return "i2p", "http"
|
||||
} else if strings.Contains(host, "onion") {
|
||||
return "tor", "http"
|
||||
} else if strings.Contains(host, "[300:") {
|
||||
return "ygg", "http"
|
||||
} else {
|
||||
return "www", "https"
|
||||
}
|
||||
|
||||
@ -1,8 +1,7 @@
|
||||
package utils
|
||||
|
||||
import (
|
||||
"os"
|
||||
"path"
|
||||
"io/ioutil"
|
||||
"strconv"
|
||||
"strings"
|
||||
|
||||
@ -29,18 +28,14 @@ func ConvertFileSize(size int64) (float64, string, string) {
|
||||
strings.Join([]string{fSizeStr, sizeSuffixes[idx]}, " ")
|
||||
}
|
||||
|
||||
func DirectorySize(dirPath string) (dirSz int64, err error) {
|
||||
dir, err := os.ReadDir(dirPath)
|
||||
func DirectorySize(path string) (dirSz int64, err error) {
|
||||
dir, err := ioutil.ReadDir(path)
|
||||
if err != nil {
|
||||
return 0, errors.Wrapf(err, "failed to compute %s directory size", dirPath)
|
||||
return 0, errors.Wrapf(err, "failed to compute %s directory size", path)
|
||||
}
|
||||
|
||||
for _, entry := range dir {
|
||||
file, err := os.Stat(path.Join(dirPath, entry.Name()))
|
||||
if err != nil {
|
||||
return 0, errors.Wrapf(err, "failed to stat a file %s", entry.Name())
|
||||
}
|
||||
dirSz += file.Size()
|
||||
dirSz += entry.Size()
|
||||
}
|
||||
|
||||
return dirSz, nil
|
||||
|
||||
@ -33,8 +33,6 @@
|
||||
background-color: var(--secondary-color);
|
||||
color: var(--background-color); }
|
||||
|
||||
.center { text-align: center; }
|
||||
|
||||
a,
|
||||
button {
|
||||
color: var(--primary-color);
|
||||
@ -52,8 +50,8 @@ input[type="file"] {
|
||||
color: var(--text-color);
|
||||
font: inherit; }
|
||||
|
||||
button,
|
||||
input[type="file"]::file-selector-button {
|
||||
input[type="file"]::file-selector-button,
|
||||
button {
|
||||
background: none;
|
||||
border: none;
|
||||
color: var(--primary-color);
|
||||
@ -93,6 +91,17 @@ h2 {
|
||||
|
||||
small { font-size: .8rem; }
|
||||
|
||||
progress {
|
||||
background-color: var(--secondary-color);
|
||||
border: none;
|
||||
color: var(--primary-color);
|
||||
height: 1.1rem;
|
||||
width: 30%; }
|
||||
|
||||
progress::-moz-progress-bar { background-color: var(--primary-color); }
|
||||
|
||||
.center { text-align: center; }
|
||||
|
||||
html { margin-left: calc(100vw - 100%); }
|
||||
|
||||
body {
|
||||
@ -109,22 +118,24 @@ header {
|
||||
flex-wrap: wrap;
|
||||
justify-content: space-between; }
|
||||
|
||||
header svg { width: 360px; }
|
||||
#logo {
|
||||
display: block;
|
||||
width: 360px; }
|
||||
|
||||
header svg text { fill: var(--text-color); }
|
||||
#logo text { fill: var(--text-color); }
|
||||
|
||||
header svg text:first-child {
|
||||
#logo .logo {
|
||||
font-size: 2rem;
|
||||
font-variant-caps: small-caps;
|
||||
font-weight: bold; }
|
||||
|
||||
header svg text:last-child { font-size: .88rem; }
|
||||
|
||||
@media screen and (-webkit-min-device-pixel-ratio:0) {
|
||||
header svg text:first-child { font-size: 2.082rem; } }
|
||||
#logo .logo { font-size: 2.082rem; } }
|
||||
|
||||
@-moz-document url-prefix() {
|
||||
header svg text:first-child { font-size: 2rem; } }
|
||||
#logo .logo { font-size: 2rem; } }
|
||||
|
||||
#logo .under { font-size: .88rem; }
|
||||
|
||||
nav { margin-top: .5rem; }
|
||||
|
||||
@ -136,13 +147,7 @@ nav h1 {
|
||||
|
||||
section { margin-top: 1rem; }
|
||||
|
||||
#error {
|
||||
font-size: 3.5rem;
|
||||
line-height: 5rem;
|
||||
text-align: center;
|
||||
margin: 6rem 0; }
|
||||
|
||||
#error h1 { font-size: 8rem; }
|
||||
#occupied-space div span { margin: 0 .2rem; }
|
||||
|
||||
footer {
|
||||
font-size: .8rem;
|
||||
@ -152,7 +157,7 @@ footer {
|
||||
@media screen and (max-width: 640px) {
|
||||
header { display: block; }
|
||||
|
||||
header svg {
|
||||
#logo {
|
||||
margin: 0 auto;
|
||||
width: 100%; }
|
||||
|
||||
|
||||
@ -1,3 +1,2 @@
|
||||
User-agent: *
|
||||
Allow: /$
|
||||
Disallow: /
|
||||
Disallow: /assets/
|
||||
@ -12,12 +12,12 @@ html(lang="en")
|
||||
block head
|
||||
body
|
||||
header
|
||||
svg(viewBox="0 -25 216 40")
|
||||
text Arav's dwelling
|
||||
text(y="11") Welcome to my sacred place, wanderer
|
||||
svg#logo(viewBox="0 -25 216 40")
|
||||
text.logo Arav's dwelling
|
||||
text.under(y="11") Welcome to my sacred place, wanderer
|
||||
nav
|
||||
a(href=mainSite title="Arav's dwelling") Back to main website
|
||||
block header
|
||||
block body
|
||||
footer
|
||||
| 2022,2023 Alexander "Arav" Andreev <#[a(href="mailto:me@arav.su") me@arav.su]> #[a(href=mainSite+'/privacy') Privacy statements]
|
||||
| 2022,2023 Alexander "Arav" Andreev <#[a(href="mailto:me@arav.su") me@arav.su]>
|
||||
@ -1,10 +1,20 @@
|
||||
extends base.jade
|
||||
|
||||
block head
|
||||
:go:func ErrorXXX(mainSite string, code int, errorMsg string)
|
||||
style(type="text/css").
|
||||
#error {
|
||||
font-size: 3.5rem;
|
||||
line-height: 5rem;
|
||||
text-align: center;
|
||||
margin: 6rem 0; }
|
||||
|
||||
#error h1 { font-size: 8rem; }
|
||||
|
||||
block header
|
||||
h1 Еггог
|
||||
|
||||
block body
|
||||
:go:func ErrorXXX(mainSite string, code int, errorMsg string)
|
||||
section#error
|
||||
h1 #{code}
|
||||
| #{http.StatusText(code)}
|
||||
|
||||
@ -4,25 +4,37 @@ block header
|
||||
h1 Upload
|
||||
|
||||
block body
|
||||
:go:func Index(mainSite string, keepForHours int, fileMaxSize, storageAvailableStr string)
|
||||
section
|
||||
:go:func Index(mainSite string, storageCapacity, storageUsed int64, keepForHours int, fileMaxSize, storageUsedStr, storageCapacityStr, storageAvailableStr string)
|
||||
section#rules.center
|
||||
h2 Rules
|
||||
p Maximum file size is #[b #{fileMaxSize}] and it will be kept for #[b #{keepForHours}] hours.
|
||||
p Content you upload should comply with Russian Federation's law. Generally speaking, anything illegal, like CP, extremist literature, and so on is forbidden.
|
||||
section.center
|
||||
section#occupied-space.center
|
||||
h2 Occupied space
|
||||
div
|
||||
span #{storageUsedStr}
|
||||
progress(value=storageUsed max=storageCapacity)
|
||||
span #{storageCapacityStr}
|
||||
div
|
||||
| #{storageAvailableStr}
|
||||
section#upload.center
|
||||
h2 Upload
|
||||
form(action="/" method="POST" enctype="multipart/form-data")
|
||||
input(type="file" name="file" multiple=false)
|
||||
button(type="submit") Upload
|
||||
p.center #[b #{storageAvailableStr}] left.
|
||||
section
|
||||
p Using cURL: #[code curl -F 'file=@somefile.ext' https://upload.arav.su]
|
||||
p Also works under other networks (I2P, Tor, Yggdrasil). For Tor and I2P you'll need to add a #[code --proxy] option for cURL. Same for deletion.
|
||||
p A resulted link has the following structure: #[code <site>/<hash>/<file>.<ext>].
|
||||
section.center
|
||||
p You can use cURL to upload a file: #[code curl -F 'file=@somefile.ext' https://upload.arav.su]
|
||||
p Over I2P: #[code curl --proxy 127.0.0.1:4444 -F 'file=@somefile.ext' http://upload.arav.i2p]
|
||||
p A resulted link looks like this: #[code /base64rawURL(salted SHA-256)/filename.ext].
|
||||
section.center
|
||||
h2 Delete
|
||||
form(action="/delete" method="POST")
|
||||
input(type="text", name="hash" placeholder="File hash goes here" minlength="43" maxlength="43" size="43" required="")
|
||||
button(type="submit") Delete
|
||||
section.center
|
||||
p You can delete a file using cURL: #[code curl -XDELETE https://upload.arav.su/<hash>]
|
||||
p Over I2P: #[code curl --proxy 127.0.0.1:4444 -XDELETE http://upload.arav.i2p/<hash>]
|
||||
section
|
||||
p Using cURL: #[code curl -XDELETE https://upload.arav.su/<hash>]
|
||||
h2 Privacy statements
|
||||
p Any abuses should be sent to #[a(href="mailto:admin@arav.su") admin@arav.su]. I WILL cooperate with law enforcements and provide them with logs.
|
||||
p Logs include: access time, IP-address, file name it was uploaded/downloaded with, a SHA-256 hash of it, size of it, and User-Agent.
|
||||
22
web/templates/nospace.jade
Normal file
22
web/templates/nospace.jade
Normal file
@ -0,0 +1,22 @@
|
||||
extends base.jade
|
||||
|
||||
block head
|
||||
:go:func ErrorNoSpace(mainSite string)
|
||||
style(type="text/css").
|
||||
#error {
|
||||
font-size: 3.5rem;
|
||||
line-height: 5rem;
|
||||
text-align: center;
|
||||
margin: 6rem 0; }
|
||||
|
||||
#error h1 { font-size: 6rem; }
|
||||
|
||||
block header
|
||||
h1 :(
|
||||
|
||||
block body
|
||||
- wr.(http.ResponseWriter).WriteHeader(http.StatusInternalServerError)
|
||||
section#error
|
||||
h1 Not enough space left
|
||||
center
|
||||
a(href="/") Back to index page
|
||||
@ -5,7 +5,7 @@ block header
|
||||
|
||||
block body
|
||||
:go:func Uploaded(mainSite, site, downloadLink string, keepForHours int)
|
||||
section
|
||||
section#file
|
||||
h2 Your link
|
||||
center
|
||||
a(href=downloadLink) #{site}#{downloadLink}
|
||||
|
||||
@ -7,6 +7,7 @@ import (
|
||||
)
|
||||
|
||||
//go:generate $GOPATH/bin/jade -pkg=web -writer templates/index.jade
|
||||
//go:generate $GOPATH/bin/jade -pkg=web -writer templates/nospace.jade
|
||||
//go:generate $GOPATH/bin/jade -pkg=web -writer templates/deleted.jade
|
||||
//go:generate $GOPATH/bin/jade -pkg=web -writer templates/uploaded.jade
|
||||
//go:generate $GOPATH/bin/jade -pkg=web -writer templates/errorXXX.jade
|
||||
|
||||
Loading…
Reference in New Issue
Block a user