diff --git a/.gitattributes b/.gitattributes
index 3c09e01..1ee55ba 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,4 +1,3 @@
*.glb binary
*.mesh binary
*.png binary
-prebuilt/* binary
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 0000000..3f24fd9
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,13 @@
+version: 2
+updates:
+ - package-ecosystem: gomod
+ directory: /
+ schedule:
+ interval: weekly
+ open-pull-requests-limit: 5
+
+ - package-ecosystem: github-actions
+ directory: /
+ schedule:
+ interval: monthly
+ open-pull-requests-limit: 5
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 0000000..8012b94
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,86 @@
+name: Release
+
+on:
+ push:
+ tags:
+ - "v*"
+
+permissions:
+ contents: write
+
+jobs:
+ verify:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v4
+ - uses: actions/setup-go@v5
+ with:
+ go-version-file: go.mod
+ cache: true
+ - name: Verify tag matches Cone version
+ run: |
+ source_version=$(sed -n 's/^[[:space:]]*Version = "\([^"]*\)"/\1/p' utils/glb.go)
+ test "${GITHUB_REF_NAME}" = "v${source_version}"
+ - run: go test -race ./...
+ - run: go vet ./...
+
+ build:
+ needs: verify
+ runs-on: ubuntu-latest
+ strategy:
+ matrix:
+ include:
+ - target: arm64
+ goarch: arm64
+ goarm: ""
+ - target: armv7
+ goarch: arm
+ goarm: "7"
+ steps:
+ - uses: actions/checkout@v4
+ - uses: actions/setup-go@v5
+ with:
+ go-version-file: go.mod
+ cache: true
+ - name: Build release archive
+ env:
+ BUILD_GOARCH: ${{ matrix.goarch }}
+ BUILD_GOARM: ${{ matrix.goarm }}
+ TARGET: ${{ matrix.target }}
+ run: |
+ version="${GITHUB_REF_NAME#v}"
+ package="cone-v${version}-linux-${TARGET}"
+ mkdir -p "dist/${package}"
+ CGO_ENABLED=0 GOOS=linux GOARCH="${BUILD_GOARCH}" GOARM="${BUILD_GOARM}" \
+ go build -buildvcs=false -trimpath -ldflags='-s -w' -o "dist/${package}/cone" .
+ go run github.com/google/go-licenses@v1.6.0 save ./... --save_path="dist/${package}/licenses"
+ mkdir -p "dist/${package}/licenses/fonts"
+ cp web/fonts/*.txt web/fonts/FONTS.md "dist/${package}/licenses/fonts/"
+ cp LICENSE README.md THIRD_PARTY_NOTICES.md "dist/${package}/"
+ tar -C dist -czf "dist/${package}.tar.gz" "${package}"
+ - uses: actions/upload-artifact@v4
+ with:
+ name: cone-${{ matrix.target }}
+ path: dist/*.tar.gz
+ if-no-files-found: error
+
+ publish:
+ needs: build
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/download-artifact@v4
+ with:
+ pattern: cone-*
+ path: dist
+ merge-multiple: true
+ - name: Create checksums
+ run: cd dist && sha256sum ./*.tar.gz > SHA256SUMS
+ - name: Publish GitHub release
+ env:
+ GH_TOKEN: ${{ github.token }}
+ run: |
+ gh release create "${GITHUB_REF_NAME}" dist/*.tar.gz dist/SHA256SUMS \
+ --repo "${GITHUB_REPOSITORY}" \
+ --verify-tag \
+ --generate-notes \
+ --title "Cone ${GITHUB_REF_NAME}"
diff --git a/.gitignore b/.gitignore
index 2a7afa0..2825f96 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,4 +10,5 @@
/output/
/batch-output/
/data/
+/dist/
*~
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index bb2ddf8..228ea56 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -8,4 +8,6 @@ Cone welcomes focused bug fixes and performance improvements.
4. Run `go test -race ./...`, `go vet ./...`, and `go build ./...`.
5. Open a pull request explaining the behavior change and how it was tested.
-For mesh-output changes, include a small synthetic regression test. Do not commit copyrighted texture packs or generated Roblox assets.
+For mesh-output changes, include a small synthetic regression test. Do not
+commit copyrighted texture packs, generated Roblox assets, or compiled release
+binaries. Tagged-release automation builds binaries from the reviewed source.
diff --git a/README.md b/README.md
index 13c4c0e..5b43c9e 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,9 @@
# Cone
+[](https://github.com/qaustria/AutoPack-Go/actions/workflows/ci.yml)
+[](https://github.com/qaustria/AutoPack-Go/releases/latest)
+[](LICENSE)
+
Cone ports Minecraft 1.8.9 texture packs to Roblox. It finds supported item and block textures, resizes them to 512×512, creates edge-expanded texture variants, builds greedy-meshed item geometry, uploads the assets through Roblox Open Cloud, and returns the compressed JSON used by the game.
@@ -76,9 +80,15 @@ uses the same port-history database and Discord notification path as a normal
website conversion.
```bash
+export CONE_BATCH_TOKEN="$(openssl rand -hex 32)"
go run . batch 'https://docs.google.com/spreadsheets/d/SHEET_ID/edit#gid=0'
```
+The web server and batch command must receive the same `CONE_BATCH_TOKEN`.
+Without it, administrative batch metadata is rejected so public clients cannot
+forge batch progress in Discord notifications. Keep the token private and use a
+separate value from every Roblox or Discord credential.
+
The sheet must be shared as **Anyone with the link → Viewer**, and download-link
cells must contain their complete `https://...` URL. `ROBLOX_API_KEY` and
`ROBLOX_USER_ID` select the Roblox account used for the import. The command
@@ -125,8 +135,25 @@ go build ./...
## Raspberry Pi
-The repository includes ARMv7 and ARM64 builds used by `deploy-pi.sh`. Install
-nginx once, then deploy without compiling on the Pi:
+Tagged releases provide ARMv7 and ARM64 archives with SHA-256 checksums and all
+required third-party license files. `deploy-pi.sh` downloads and verifies the
+release matching its configured Cone version, so the Pi does not compile Go.
+
+Store server-only values outside the checkout:
+
+```bash
+sudo install -d -m 0700 /etc/cone
+sudoedit /etc/cone/cone.env
+```
+
+Example `/etc/cone/cone.env`:
+
+```bash
+CONE_DISCORD_WEBHOOK_URL=https://discord.com/api/webhooks/REPLACE_ME
+CONE_BATCH_TOKEN=REPLACE_WITH_OPENSSL_RAND_HEX_32
+```
+
+Then install nginx once and deploy:
```bash
sudo apt-get update && sudo apt-get install -y nginx
@@ -135,10 +162,16 @@ git pull --ff-only origin master
./deploy-pi.sh
```
+Set `CONE_VERSION` only when intentionally deploying a different published
+version, for example `sudo CONE_VERSION=1.5.0 ./deploy-pi.sh`.
+
## Security
Never commit `.env.go`. See [SECURITY.md](SECURITY.md) for credential handling and private vulnerability reporting.
+Release archives include dependency licenses described in
+[THIRD_PARTY_NOTICES.md](THIRD_PARTY_NOTICES.md).
+
## License
[MIT](LICENSE)
diff --git a/SECURITY.md b/SECURITY.md
index 8ca8d7e..f818fc4 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -9,8 +9,12 @@ Please report security issues through a [private GitHub security advisory](https
- The public web interface sends Roblox credentials only with the active conversion request.
- Cone does not write request credentials to server storage or logs.
- “Remember on this device” uses the browser's local storage and can be turned off.
+- Browser local storage is not appropriate on shared or untrusted devices; turn
+ remembering off there and remove saved site data afterward.
- Self-hosted CLI credentials belong in the ignored `.env.go` file or environment variables.
- Always deploy Cone behind HTTPS before accepting credentials over a network.
+- Administrative batch labels require a separate `CONE_BATCH_TOKEN`; never
+ reuse a Roblox API key or Discord webhook token for it.
Rotate a credential immediately if it is accidentally committed, pasted into an issue, or exposed in logs.
diff --git a/THIRD_PARTY_NOTICES.md b/THIRD_PARTY_NOTICES.md
new file mode 100644
index 0000000..88be200
--- /dev/null
+++ b/THIRD_PARTY_NOTICES.md
@@ -0,0 +1,18 @@
+# Third-party notices
+
+Cone depends on open-source packages under MIT, BSD-2-Clause,
+BSD-3-Clause, and Apache-2.0 licenses. Every GitHub release archive includes
+the exact dependency license files generated from the released Go dependency
+graph under its `licenses/` directory.
+
+Direct dependencies include:
+
+- `github.com/klauspost/compress` — Apache-2.0
+- `github.com/robloxapi/rbxfile` — MIT
+- `go.etcd.io/bbolt` — MIT
+
+Transitive dependencies and their license files are included automatically in
+each release archive. Bundled web-font notices and full license texts are in
+`web/fonts/`.
+
+Cone's own source code is licensed under the MIT License in `LICENSE`.
diff --git a/batch.go b/batch.go
index 05aa6c5..d509f24 100644
--- a/batch.go
+++ b/batch.go
@@ -98,6 +98,10 @@ func runBatch(ctx context.Context, args []string) error {
if err := validateBatchEndpoint(endpoint); err != nil {
return err
}
+ batchToken := strings.TrimSpace(os.Getenv("CONE_BATCH_TOKEN"))
+ if len(batchToken) < 32 || len(batchToken) > 256 {
+ return errors.New("CONE_BATCH_TOKEN must contain between 32 and 256 characters")
+ }
if err := os.MkdirAll(outputDir, 0o750); err != nil {
return fmt.Errorf("create batch output directory: %w", err)
}
@@ -133,7 +137,7 @@ func runBatch(ctx context.Context, args []string) error {
fmt.Printf("[%d/%d] FAILED %s: %v\n", index+1, len(queue), entry.Name, err)
continue
}
- result, err := submitBatchPackWhenAvailable(ctx, client, endpoint, credentials, zipPath, filename, index+1, len(queue), func(progress ProgressEvent) {
+ result, err := submitBatchPackWhenAvailable(ctx, client, endpoint, credentials, batchToken, zipPath, filename, index+1, len(queue), func(progress ProgressEvent) {
message := progress.Message
if message == "" {
message = progress.Name
@@ -150,6 +154,12 @@ func runBatch(ctx context.Context, args []string) error {
})
_ = os.Remove(zipPath)
if err != nil {
+ if batchAuthenticationFailed(err) {
+ return fmt.Errorf(
+ "batch paused at [%d/%d] %s because Roblox rejected the credentials: %w; replace the API key or use an unmoderated owner, then rerun the same command to resume",
+ index+1, len(queue), entry.Name, err,
+ )
+ }
failed++
fmt.Printf("[%d/%d] FAILED %s: %v\n", index+1, len(queue), entry.Name, err)
continue
@@ -201,10 +211,22 @@ func (err *batchServerError) Error() string {
return "Cone returned " + err.Status + ": " + err.Message
}
-func submitBatchPackWhenAvailable(ctx context.Context, client *http.Client, endpoint string, credentials robloxCredentials, zipPath, filename string, batchIndex, batchTotal int, progress ProgressFunc) (batchSubmitResult, error) {
+// Authentication failures affect every remaining pack, so continuing would
+// only hammer Roblox and hide the real problem behind hundreds of failures.
+// The completed checkpoint stays intact and the same command can resume once
+// working credentials are supplied.
+func batchAuthenticationFailed(err error) bool {
+ var serverError *batchServerError
+ if !errors.As(err, &serverError) {
+ return false
+ }
+ return serverError.StatusCode == http.StatusUnauthorized || serverError.StatusCode == http.StatusForbidden
+}
+
+func submitBatchPackWhenAvailable(ctx context.Context, client *http.Client, endpoint string, credentials robloxCredentials, batchToken, zipPath, filename string, batchIndex, batchTotal int, progress ProgressFunc) (batchSubmitResult, error) {
deadline := time.Now().Add(30 * time.Minute)
for {
- result, err := submitBatchPack(ctx, client, endpoint, credentials, zipPath, filename, batchIndex, batchTotal, progress)
+ result, err := submitBatchPack(ctx, client, endpoint, credentials, batchToken, zipPath, filename, batchIndex, batchTotal, progress)
var serverError *batchServerError
if !errors.As(err, &serverError) || serverError.StatusCode != http.StatusTooManyRequests {
return result, err
@@ -227,7 +249,7 @@ func submitBatchPackWhenAvailable(ctx context.Context, client *http.Client, endp
}
}
-func submitBatchPack(ctx context.Context, client *http.Client, endpoint string, credentials robloxCredentials, zipPath, filename string, batchIndex, batchTotal int, progress ProgressFunc) (batchSubmitResult, error) {
+func submitBatchPack(ctx context.Context, client *http.Client, endpoint string, credentials robloxCredentials, batchToken, zipPath, filename string, batchIndex, batchTotal int, progress ProgressFunc) (batchSubmitResult, error) {
file, err := os.Open(zipPath)
if err != nil {
return batchSubmitResult{}, fmt.Errorf("open queued pack: %w", err)
@@ -265,6 +287,7 @@ func submitBatchPack(ctx context.Context, client *http.Client, endpoint string,
request.Header.Set(robloxUserIDHeader, credentials.UserID)
request.Header.Set(batchIndexHeader, strconv.Itoa(batchIndex))
request.Header.Set(batchTotalHeader, strconv.Itoa(batchTotal))
+ request.Header.Set(batchTokenHeader, batchToken)
response, err := client.Do(request)
if err != nil {
_ = reader.CloseWithError(err)
diff --git a/batch_test.go b/batch_test.go
index bc4dc71..59b2ae4 100644
--- a/batch_test.go
+++ b/batch_test.go
@@ -5,6 +5,7 @@ import (
"bytes"
"context"
"encoding/json"
+ "errors"
"fmt"
"io"
"net/http"
@@ -67,6 +68,26 @@ func TestMediaFireFolderKeyAndSourceIdentity(t *testing.T) {
}
}
+func TestBatchAuthenticationFailed(t *testing.T) {
+ tests := []struct {
+ name string
+ err error
+ want bool
+ }{
+ {name: "unauthorized", err: &batchServerError{StatusCode: http.StatusUnauthorized}, want: true},
+ {name: "forbidden", err: fmt.Errorf("submit pack: %w", &batchServerError{StatusCode: http.StatusForbidden}), want: true},
+ {name: "bad pack", err: &batchServerError{StatusCode: http.StatusBadRequest}, want: false},
+ {name: "download", err: errors.New("download failed"), want: false},
+ }
+ for _, test := range tests {
+ t.Run(test.name, func(t *testing.T) {
+ if got := batchAuthenticationFailed(test.err); got != test.want {
+ t.Fatalf("batchAuthenticationFailed() = %t, want %t", got, test.want)
+ }
+ })
+ }
+}
+
func TestRunBatchQueuesSequentiallyAndResumes(t *testing.T) {
zipBytes := testBatchZIP(t)
zipPath := filepath.Join(t.TempDir(), "pack.zip")
@@ -95,6 +116,10 @@ func TestRunBatchQueuesSequentiallyAndResumes(t *testing.T) {
http.Error(response, "bad credentials", http.StatusUnauthorized)
return
}
+ if request.Header.Get(batchTokenHeader) != "test-batch-token-with-at-least-32-characters" {
+ http.Error(response, "bad batch token", http.StatusForbidden)
+ return
+ }
current := active.Add(1)
defer active.Add(-1)
for {
@@ -126,6 +151,7 @@ func TestRunBatchQueuesSequentiallyAndResumes(t *testing.T) {
t.Setenv("ROBLOX_API_KEY", "test-api-key")
t.Setenv("ROBLOX_USER_ID", "12345")
t.Setenv("ROBLOX_GROUP_ID", "")
+ t.Setenv("CONE_BATCH_TOKEN", "test-batch-token-with-at-least-32-characters")
t.Setenv("CONE_BATCH_ENDPOINT", server.URL+"/api/convert")
temporary := t.TempDir()
statePath := filepath.Join(temporary, "state", "queue.json")
diff --git a/deploy-pi.sh b/deploy-pi.sh
index 0ed64e7..c750fd6 100755
--- a/deploy-pi.sh
+++ b/deploy-pi.sh
@@ -6,12 +6,13 @@ if [ "$(id -u)" -ne 0 ]; then
fi
repo_dir=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
+cone_version=${CONE_VERSION:-1.5.0}
case "$(uname -m)" in
aarch64|arm64)
- source_binary="$repo_dir/prebuilt/cone-linux-arm64"
+ release_target=arm64
;;
armv7l|armv7*)
- source_binary="$repo_dir/prebuilt/cone-linux-armv7"
+ release_target=armv7
;;
*)
echo "Unsupported Raspberry Pi architecture: $(uname -m)" >&2
@@ -19,14 +20,30 @@ case "$(uname -m)" in
;;
esac
-if [ ! -f "$source_binary" ]; then
- echo "Missing prebuilt Cone binary: $source_binary" >&2
+for command in curl sha256sum tar nginx; do
+ if ! command -v "$command" >/dev/null 2>&1; then
+ echo "$command is required for the Cone Pi deployment." >&2
+ echo "Install dependencies with: sudo apt-get update && sudo apt-get install -y nginx curl" >&2
+ exit 1
+ fi
+done
+
+archive="cone-v${cone_version}-linux-${release_target}.tar.gz"
+release_url="https://github.com/qaustria/AutoPack-Go/releases/download/v${cone_version}"
+release_dir=$(mktemp -d /tmp/cone-release.XXXXXX)
+trap 'rm -rf -- "$release_dir"' EXIT HUP INT TERM
+curl -fsSL "$release_url/$archive" -o "$release_dir/$archive"
+curl -fsSL "$release_url/SHA256SUMS" -o "$release_dir/SHA256SUMS"
+checksum=$(awk -v archive="$archive" '$2 == "./" archive || $2 == archive { print; exit }' "$release_dir/SHA256SUMS")
+if [ -z "$checksum" ]; then
+ echo "Release checksum is missing for $archive." >&2
exit 1
fi
-
-if ! command -v nginx >/dev/null 2>&1; then
- echo "nginx is required for the Cone Pi deployment." >&2
- echo "Install it with: sudo apt-get update && sudo apt-get install -y nginx" >&2
+printf '%s\n' "$checksum" | (cd "$release_dir" && sha256sum -c -)
+tar -xzf "$release_dir/$archive" -C "$release_dir"
+source_binary="$release_dir/cone-v${cone_version}-linux-${release_target}/cone"
+if [ ! -x "$source_binary" ]; then
+ echo "Release archive does not contain an executable Cone binary." >&2
exit 1
fi
@@ -84,7 +101,7 @@ while [ "$i" -lt 20 ]; do
if health=$(curl -fsS http://127.0.0.1:8080/healthz 2>/dev/null); then
printf '%s\n' "$health"
case "$health" in
- *'"version":"1.4.9"'*) break ;;
+ *'"version":"'"$cone_version"'"'*) break ;;
esac
fi
i=$((i + 1))
@@ -92,7 +109,7 @@ while [ "$i" -lt 20 ]; do
done
if [ "$i" -ge 20 ]; then
- echo "Cone started, but its private healthz did not report version 1.4.9." >&2
+ echo "Cone started, but its private healthz did not report version $cone_version." >&2
journalctl -u cone -n 30 --no-pager >&2 || true
exit 1
fi
@@ -102,12 +119,12 @@ systemctl restart nginx
health=$(curl -fsS -H 'Host: qstr.xyz' http://127.0.0.1/healthz)
printf '%s\n' "$health"
case "$health" in
- *'"version":"1.4.9"'*) ;;
+ *'"version":"'"$cone_version"'"'*) ;;
*)
- echo "nginx is running, but the proxied healthz did not report version 1.4.9." >&2
+ echo "nginx is running, but the proxied healthz did not report version $cone_version." >&2
journalctl -u nginx -n 30 --no-pager >&2 || true
exit 1
;;
esac
-echo "Cone 1.4.9 is running through nginx on localhost:80."
+echo "Cone $cone_version is running through nginx on localhost:80."
diff --git a/deploy/systemd/cone-pi.conf b/deploy/systemd/cone-pi.conf
index 5247ca9..97d61c6 100644
--- a/deploy/systemd/cone-pi.conf
+++ b/deploy/systemd/cone-pi.conf
@@ -1,3 +1,4 @@
[Service]
Environment=AUTOPACK_ADDR=127.0.0.1:8080
Environment=CONE_MAX_CONCURRENT_PORTS=1
+EnvironmentFile=-/etc/cone/cone.env
diff --git a/main.go b/main.go
index 8a06143..f760fc1 100644
--- a/main.go
+++ b/main.go
@@ -160,6 +160,7 @@ func runWeb(ctx context.Context) error {
}
handler, err := NewCredentialWebHandlerWithOptions(newWebRequestProcessor, WebHandlerOptions{
Notifier: notifier, Store: store, MaxConcurrentPorts: maxConcurrentPorts,
+ BatchToken: strings.TrimSpace(os.Getenv("CONE_BATCH_TOKEN")),
})
if err != nil {
return err
diff --git a/prebuilt/cone-linux-arm64 b/prebuilt/cone-linux-arm64
deleted file mode 100755
index ca94361..0000000
Binary files a/prebuilt/cone-linux-arm64 and /dev/null differ
diff --git a/prebuilt/cone-linux-armv7 b/prebuilt/cone-linux-armv7
deleted file mode 100755
index 4e492e8..0000000
Binary files a/prebuilt/cone-linux-armv7 and /dev/null differ
diff --git a/utils/glb.go b/utils/glb.go
index 475a428..d5f7438 100644
--- a/utils/glb.go
+++ b/utils/glb.go
@@ -11,7 +11,7 @@ import (
const (
// Version identifies the AutoPack library in generated GLB metadata.
- Version = "1.4.9"
+ Version = "1.5.0"
glbMagic = 0x46546c67
glbVersion = 2
diff --git a/web.go b/web.go
index 525a887..4f0910b 100644
--- a/web.go
+++ b/web.go
@@ -3,6 +3,7 @@ package main
import (
"context"
"crypto/sha256"
+ "crypto/subtle"
"embed"
"encoding/json"
"errors"
@@ -35,13 +36,17 @@ const (
robloxUserIDHeader = "X-Cone-Roblox-User-Id"
batchIndexHeader = "X-Cone-Batch-Index"
batchTotalHeader = "X-Cone-Batch-Total"
+ batchTokenHeader = "X-Cone-Batch-Token"
defaultMaxConcurrentPorts = 2
)
+var errBatchAuthorization = errors.New("administrative batch credentials are invalid")
+
type WebHandlerOptions struct {
Notifier PortNotifier
Store *packstore.Store
MaxConcurrentPorts int
+ BatchToken string
}
type webHandler struct {
@@ -53,6 +58,7 @@ type webHandler struct {
activeJobsMu sync.Mutex
activeJobs map[[sha256.Size]byte]struct{}
jobSlots chan struct{}
+ batchToken string
}
type webStreamEvent struct {
@@ -72,7 +78,7 @@ func NewWebHandler(processor uploadProcessor) (http.Handler, error) {
if err != nil {
return nil, fmt.Errorf("load embedded web files: %w", err)
}
- handler := newWebHandler(assets, defaultMaxConcurrentPorts)
+ handler := newWebHandler(assets, defaultMaxConcurrentPorts, "")
handler.processor = processor
return handler.routes(), nil
}
@@ -105,22 +111,27 @@ func NewCredentialWebHandlerWithOptions(factory requestProcessorFactory, options
if options.MaxConcurrentPorts < 1 || options.MaxConcurrentPorts > 32 {
return nil, errors.New("maximum concurrent ports must be between 1 and 32")
}
+ options.BatchToken = strings.TrimSpace(options.BatchToken)
+ if options.BatchToken != "" && (len(options.BatchToken) < 32 || len(options.BatchToken) > 256) {
+ return nil, errors.New("administrative batch token must be between 32 and 256 characters")
+ }
assets, err := fs.Sub(embeddedWebFiles, "web")
if err != nil {
return nil, fmt.Errorf("load embedded web files: %w", err)
}
- handler := newWebHandler(assets, options.MaxConcurrentPorts)
+ handler := newWebHandler(assets, options.MaxConcurrentPorts, options.BatchToken)
handler.processorFactory = factory
handler.notifier = options.Notifier
handler.packStore = options.Store
return handler.routes(), nil
}
-func newWebHandler(assets fs.FS, maxConcurrentPorts int) *webHandler {
+func newWebHandler(assets fs.FS, maxConcurrentPorts int, batchToken string) *webHandler {
return &webHandler{
static: http.FileServer(http.FS(assets)),
activeJobs: make(map[[sha256.Size]byte]struct{}),
jobSlots: make(chan struct{}, maxConcurrentPorts),
+ batchToken: batchToken,
}
}
@@ -149,9 +160,13 @@ func (h *webHandler) convert(response http.ResponseWriter, request *http.Request
return
}
processor := h.processor
- batchIndex, batchTotal, err := batchPositionFromHeaders(request.Header)
+ batchIndex, batchTotal, err := batchPositionFromHeaders(request.Header, h.batchToken)
if err != nil {
- http.Error(response, err.Error(), http.StatusBadRequest)
+ status := http.StatusBadRequest
+ if errors.Is(err, errBatchAuthorization) {
+ status = http.StatusForbidden
+ }
+ http.Error(response, err.Error(), status)
return
}
jobKey := sha256.Sum256([]byte("cone-shared-web-processor"))
@@ -256,15 +271,23 @@ func (h *webHandler) convert(response http.ResponseWriter, request *http.Request
})
}
-func batchPositionFromHeaders(headers http.Header) (int, int, error) {
+func batchPositionFromHeaders(headers http.Header, configuredToken string) (int, int, error) {
indexValue := strings.TrimSpace(headers.Get(batchIndexHeader))
totalValue := strings.TrimSpace(headers.Get(batchTotalHeader))
+ providedToken := strings.TrimSpace(headers.Get(batchTokenHeader))
if indexValue == "" && totalValue == "" {
+ if providedToken != "" {
+ return 0, 0, errors.New("administrative batch token requires batch position headers")
+ }
return 0, 0, nil
}
if indexValue == "" || totalValue == "" {
return 0, 0, errors.New("batch index and total headers must be provided together")
}
+ if configuredToken == "" || providedToken == "" || len(configuredToken) != len(providedToken) ||
+ subtle.ConstantTimeCompare([]byte(configuredToken), []byte(providedToken)) != 1 {
+ return 0, 0, errBatchAuthorization
+ }
index, indexErr := strconv.Atoi(indexValue)
total, totalErr := strconv.Atoi(totalValue)
if indexErr != nil || totalErr != nil || index < 1 || total < index || total > maxBatchQueueEntries {
diff --git a/web/fonts/APACHE-2.0.txt b/web/fonts/APACHE-2.0.txt
new file mode 100644
index 0000000..87d5574
--- /dev/null
+++ b/web/fonts/APACHE-2.0.txt
@@ -0,0 +1,304 @@
+Copyright (c) 2012 The Go Authors. All rights reserved.
+Copyright (c) 2019 Klaus Post. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+ * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+ * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+------------------
+
+Files: gzhttp/*
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright 2016-2017 The New York Times Company
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+------------------
+
+Files: s2/cmd/internal/readahead/*
+
+The MIT License (MIT)
+
+Copyright (c) 2015 Klaus Post
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+---------------------
+Files: snappy/*
+Files: internal/snapref/*
+
+Copyright (c) 2011 The Snappy-Go Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+ * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+ * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+-----------------
+
+Files: s2/cmd/internal/filepathx/*
+
+Copyright 2016 The filepathx Authors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/web/fonts/FONTS.md b/web/fonts/FONTS.md
new file mode 100644
index 0000000..4e1cc48
--- /dev/null
+++ b/web/fonts/FONTS.md
@@ -0,0 +1,14 @@
+# Bundled fonts
+
+- `inter-var.woff2` — Inter, copyright 2016 The Inter Project Authors,
+ licensed under the SIL Open Font License 1.1. See `OFL.txt`.
+- `FredokaOne-Regular.ttf` — Fredoka One, copyright 2011 Milena B Brandao,
+ licensed under the SIL Open Font License 1.1. The font reserves the name
+ “Fredoka.” See `OFL.txt`.
+- `LuckiestGuy-Regular.ttf` — Luckiest Guy, copyright 2010 Brian J.
+ Bonislawsky DBA Astigmatic (AOETI), licensed under Apache License 2.0. See
+ `APACHE-2.0.txt`.
+
+The font files retain their embedded copyright and licensing metadata. Inter
+and Fredoka One may not be sold by themselves, and modified Fredoka builds may
+not use its reserved font name without permission.
diff --git a/web/fonts/FredokaOne-Regular.ttf b/web/fonts/FredokaOne-Regular.ttf
new file mode 100644
index 0000000..ac68bcf
Binary files /dev/null and b/web/fonts/FredokaOne-Regular.ttf differ
diff --git a/web/fonts/LuckiestGuy-Regular.ttf b/web/fonts/LuckiestGuy-Regular.ttf
new file mode 100644
index 0000000..3020a35
Binary files /dev/null and b/web/fonts/LuckiestGuy-Regular.ttf differ
diff --git a/web/index.html b/web/index.html
index 1623fac..14e31de 100644
--- a/web/index.html
+++ b/web/index.html
@@ -3,12 +3,13 @@
-
+
Cone
-
-
-
+
+
+
+
@@ -21,58 +22,66 @@
-