Compare commits
3
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 xuu
|
1b8e8ad26a
|
||
|
xuu
|
f71e50fbe6
|
||
|
xuu
|
9a26239aa7
|
No files matched your search
@@ -1,8 +1,8 @@
|
||||
name: Deploy
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: [ "master" ]
|
||||
# push:
|
||||
# branches: [ "master" ]
|
||||
release:
|
||||
types: [ published ]
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@ export PASTE_STORE=data/paste/
|
||||
export ARTIFACT_STORE=data/artifact/
|
||||
export IMAGE_STORE=data/image/
|
||||
|
||||
SOURCE=$(wildcard v2/*.go) $(wildcard v2/paste/*.go) $(wildcard assets/*.go)
|
||||
SOURCE=$(wildcard *.go) $(wildcard paste/*.go) $(wildcard assets/*.go)
|
||||
ASSETS=$(wildcard assets/*) $(wildcard assets/public/*) $(wildcard assets/src/*) $(wildcard assets/src/paste/*)
|
||||
ASSET_FILE=assets/build/index.html
|
||||
BINARY=sour.is-paste
|
||||
@@ -20,8 +20,7 @@ test:
|
||||
go test ./...
|
||||
go vet ./...
|
||||
run: $(BINARY)
|
||||
# go run ./v2
|
||||
./$(BINARY)
|
||||
go run .
|
||||
|
||||
build-assets: $(ASSET_FILE)
|
||||
${ASSET_FILE}: $(ASSETS)
|
||||
@@ -30,7 +29,7 @@ ${ASSET_FILE}: $(ASSETS)
|
||||
|
||||
build: $(BINARY)
|
||||
$(BINARY): $(SOURCE) $(ASSET_FILE)
|
||||
go build -o $(BINARY) ./v2
|
||||
go build -o $(BINARY) .
|
||||
|
||||
.PHONEY: all clean build run setup
|
||||
# DO NOT DELETE
|
||||
@@ -0,0 +1,39 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"context"
|
||||
"embed"
|
||||
"io/fs"
|
||||
"net/http"
|
||||
|
||||
"go.sour.is/pkg/lg"
|
||||
"go.sour.is/pkg/service"
|
||||
)
|
||||
|
||||
var _ = apps.Register(10, func(ctx context.Context, svc *service.Harness) error {
|
||||
_, span := lg.Span(ctx)
|
||||
defer span.End()
|
||||
|
||||
svc.Add(&favicon{})
|
||||
|
||||
return nil
|
||||
})
|
||||
|
||||
//go:embed favicon/*
|
||||
var faviconAsset embed.FS
|
||||
|
||||
type favicon struct{}
|
||||
|
||||
func (favicon) RegisterHTTP(mux *http.ServeMux) {
|
||||
dir, _ := fs.Sub(faviconAsset, "favicon")
|
||||
srv := http.FileServer(http.FS(dir))
|
||||
|
||||
mux.Handle("/favicon.ico", srv)
|
||||
mux.Handle("/favicon.txt", srv)
|
||||
mux.Handle("/favicon-16x16.png", srv)
|
||||
mux.Handle("/favicon-32x32.png", srv)
|
||||
mux.Handle("/android-chrome-192x192.png", srv)
|
||||
mux.Handle("/android-chrome-512x512.png", srv)
|
||||
mux.Handle("/apple-touch-icon.png", srv)
|
||||
mux.Handle("/site.webmanifest", srv)
|
||||
}
|
||||
+1
-1
@@ -15,7 +15,7 @@ var _ = apps.Register(40, func(ctx context.Context, svc *service.Harness) error
|
||||
|
||||
store := env.Default("IMAGE_STORE", "data/")
|
||||
|
||||
a, err := image.New(store, -1)
|
||||
a, err := image.New(ctx, store, -1)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
{
|
||||
"files": {
|
||||
"main.css": "/ui/static/css/main.d4025777.css",
|
||||
"main.js": "/ui/static/js/main.1d06557a.js",
|
||||
"main.js": "/ui/static/js/main.939bead5.js",
|
||||
"index.html": "/ui/index.html",
|
||||
"main.d4025777.css.map": "/ui/static/css/main.d4025777.css.map",
|
||||
"main.1d06557a.js.map": "/ui/static/js/main.1d06557a.js.map"
|
||||
"main.939bead5.js.map": "/ui/static/js/main.939bead5.js.map"
|
||||
},
|
||||
"entrypoints": [
|
||||
"static/css/main.d4025777.css",
|
||||
"static/js/main.1d06557a.js"
|
||||
"static/js/main.939bead5.js"
|
||||
]
|
||||
}
|
||||
@@ -1 +1 @@
|
||||
<!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="theme-color" content="#000000"><link rel="manifest" href="/ui/manifest.json"><link rel="shortcut icon" href="/ui/favicon.ico"><title>DN42 Paste</title><script defer="defer" src="/ui/static/js/main.1d06557a.js"></script><link href="/ui/static/css/main.d4025777.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
|
||||
<!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="theme-color" content="#000000"><link rel="manifest" href="/ui/manifest.json"><link rel="shortcut icon" href="/ui/favicon.ico"><title>DN42 Paste</title><script defer="defer" src="/ui/static/js/main.939bead5.js"></script><link href="/ui/static/css/main.d4025777.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
|
||||
@@ -1,3 +1,3 @@
|
||||
/*! For license information please see main.1d06557a.js.LICENSE.txt */
|
||||
!function(){var e={4660:function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r,o=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e},a=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),i=n(2791),s=(r=i)&&r.__esModule?r:{default:r},l=n(9451),c=n(6795),u=n(5351);var d=function(e){function t(){return function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,t),function(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!==typeof t&&"function"!==typeof t?e:t}(this,(t.__proto__||Object.getPrototypeOf(t)).apply(this,arguments))}return function(e,t){if("function"!==typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}(t,e),a(t,[{key:"render",value:function(){var e=l.JS.lessProps(this.props,"role");return s.default.createElement(u.BDiv,o({role:"alert"},e),this.props.children)}}]),t}(i.Component);t.default=(0,c.stack)(d,[(0,c.withClassName)("alert"),(0,c.withPurpose)("alert")])},8456:function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r,o=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e},a=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),i=n(2791),s=(r=i)&&r.__esModule?r:{default:r},l=n(9451),c=n(6795),u=n(5351);var d=function(e){function t(){return function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,t),function(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!==typeof t&&"function"!==typeof t?e:t}(this,(t.__proto__||Object.getPrototypeOf(t)).apply(this,arguments))}return function(e,t){if("function"!==typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}(t,e),a(t,[{key:"render",value:function(){var e=this.props.pill,t=(0,c.mergeClassName)(this.props,e?"badge-pill":""),n=l.JS.lessProps(this.props,["className","pill"]);return s.default.createElement(u.BSpan,o({},n,{className:t}),this.props.children)}}]),t}(i.Component);t.default=(0,c.stack)(d,[(0,c.withClassName)("badge"),(0,c.withPurpose)("badge")])},8284:function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r,o=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),a=n(2791),i=(r=a)&&r.__esModule?r:{default:r},s=n(6795),l=n(5351);function c(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function u(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!==typeof t&&"function"!==typeof t?e:t}function d(e,t){if("function"!==typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}var p=function(e){function t(){return c(this,t),u(this,(t.__proto__||Object.getPrototypeOf(t)).apply(this,arguments))}return d(t,e),o(t,[{key:"render",value:function(){return i.default.createElement(l.BBlockquote,this.props,this.props.children)}}]),t}(a.Component),f=function(e){function t(){return c(this,t),u(this,(t.__proto__||Object.getPrototypeOf(t)).apply(this,arguments))}return d(t,e),o(t,[{key:"render",value:function(){return i.default.createElement(l.BFooter,this.props,this.props.children)}}]),t}(a.Component),m=(0,s.withClassName)("blockquote")(p),_=(0,s.withClassName)("blockquote-footer")(f);m.Footer=_,t.default=m},1:function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r,o=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,Line truncated
|
||||
//# sourceMappingURL=main.1d06557a.js.map
|
||||
/*! For license information please see main.939bead5.js.LICENSE.txt */
|
||||
!function(){var e={4660:function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r,o=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e},a=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),i=n(2791),s=(r=i)&&r.__esModule?r:{default:r},l=n(9451),c=n(6795),u=n(5351);var d=function(e){function t(){return function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,t),function(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!==typeof t&&"function"!==typeof t?e:t}(this,(t.__proto__||Object.getPrototypeOf(t)).apply(this,arguments))}return function(e,t){if("function"!==typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}(t,e),a(t,[{key:"render",value:function(){var e=l.JS.lessProps(this.props,"role");return s.default.createElement(u.BDiv,o({role:"alert"},e),this.props.children)}}]),t}(i.Component);t.default=(0,c.stack)(d,[(0,c.withClassName)("alert"),(0,c.withPurpose)("alert")])},8456:function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r,o=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e},a=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),i=n(2791),s=(r=i)&&r.__esModule?r:{default:r},l=n(9451),c=n(6795),u=n(5351);var d=function(e){function t(){return function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,t),function(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!==typeof t&&"function"!==typeof t?e:t}(this,(t.__proto__||Object.getPrototypeOf(t)).apply(this,arguments))}return function(e,t){if("function"!==typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}(t,e),a(t,[{key:"render",value:function(){var e=this.props.pill,t=(0,c.mergeClassName)(this.props,e?"badge-pill":""),n=l.JS.lessProps(this.props,["className","pill"]);return s.default.createElement(u.BSpan,o({},n,{className:t}),this.props.children)}}]),t}(i.Component);t.default=(0,c.stack)(d,[(0,c.withClassName)("badge"),(0,c.withPurpose)("badge")])},8284:function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r,o=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),a=n(2791),i=(r=a)&&r.__esModule?r:{default:r},s=n(6795),l=n(5351);function c(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function u(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!==typeof t&&"function"!==typeof t?e:t}function d(e,t){if("function"!==typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}var p=function(e){function t(){return c(this,t),u(this,(t.__proto__||Object.getPrototypeOf(t)).apply(this,arguments))}return d(t,e),o(t,[{key:"render",value:function(){return i.default.createElement(l.BBlockquote,this.props,this.props.children)}}]),t}(a.Component),f=function(e){function t(){return c(this,t),u(this,(t.__proto__||Object.getPrototypeOf(t)).apply(this,arguments))}return d(t,e),o(t,[{key:"render",value:function(){return i.default.createElement(l.BFooter,this.props,this.props.children)}}]),t}(a.Component),m=(0,s.withClassName)("blockquote")(p),_=(0,s.withClassName)("blockquote-footer")(f);m.Footer=_,t.default=m},1:function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r,o=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,Line truncated
|
||||
//# sourceMappingURL=main.939bead5.js.map
|
||||
File renamed without changes.
+1
-1
@@ -1 +1 @@
|
||||
{"version":3,"file":"static/js/main.1d06557a.js","mappings":"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 truncated
|
||||
{"version":3,"file":"static/js/main.939bead5.js","mappings":"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 truncated
|
||||
@@ -200,17 +200,17 @@ class Paste extends Component {
|
||||
onSubmit(event) {
|
||||
event.preventDefault();
|
||||
const { plain } = this.state;
|
||||
const { history } = this.props;
|
||||
// const { history } = this.props;
|
||||
|
||||
this.encrypt(plain).then(([hash, decryptKey]) => { history.push('/#/' + hash + '!' + decryptKey) });
|
||||
this.encrypt(plain).then(([hash, decryptKey]) => { history.pushState({}, '', '/ui/#/' + hash + '!' + decryptKey) });
|
||||
}
|
||||
onNew(event) {
|
||||
const { history } = this.props;
|
||||
this.setState({cipher:"", plain:"", hash: "", decryptKey: "", syntax: "text", expire: 604800, burn: false}, () => history.push('/'));
|
||||
// const { history } = this.props;
|
||||
this.setState({cipher:"", plain:"", hash: "", decryptKey: "", syntax: "text", expire: 604800, burn: false}, () => history.pushState({}, '', '/ui'));
|
||||
}
|
||||
onCopy(event) {
|
||||
const { history } = this.props;
|
||||
this.setState({hash: "", decryptKey: ""}, () => history.push('/'))
|
||||
// const { history } = this.props;
|
||||
this.setState({hash: "", decryptKey: ""}, () => history.pushState({}, '', '/ui'))
|
||||
}
|
||||
|
||||
decrypt(tx) {
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 6.5 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 23 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 5.6 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 472 B |
Binary file not shown.
|
After Width: | Height: | Size: 847 B |
Binary file not shown.
|
After Width: | Height: | Size: 15 KiB |
@@ -0,0 +1,6 @@
|
||||
This favicon was generated using the following graphics from Twitter Twemoji:
|
||||
|
||||
- Graphics Title: 1f4cb.svg
|
||||
- Graphics Author: Copyright 2020 Twitter, Inc and other contributors (https://github.com/twitter/twemoji)
|
||||
- Graphics Source: https://github.com/twitter/twemoji/blob/master/assets/svg/1f4cb.svg
|
||||
- Graphics License: CC-BY 4.0 (https://creativecommons.org/licenses/by/4.0/)
|
||||
@@ -0,0 +1 @@
|
||||
{"name":"sour.is paste","short_name":"paste","icons":[{"src":"/android-chrome-192x192.png","sizes":"192x192","type":"image/png"},{"src":"/android-chrome-512x512.png","sizes":"512x512","type":"image/png"}],"theme_color":"#ffffff","background_color":"#ffffff","display":"standalone"}
|
||||
@@ -5,6 +5,7 @@ go 1.21
|
||||
require (
|
||||
github.com/gomarkdown/markdown v0.0.0-20200824053859-8c8b3816f167
|
||||
github.com/h2non/filetype v1.1.0
|
||||
github.com/matryer/is v1.4.1
|
||||
github.com/rs/cors v1.6.0
|
||||
go.opentelemetry.io/otel v1.18.0
|
||||
go.opentelemetry.io/otel/trace v1.18.0
|
||||
@@ -47,7 +48,7 @@ require (
|
||||
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.18.0 // indirect
|
||||
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.18.0 // indirect
|
||||
go.opentelemetry.io/otel/exporters/prometheus v0.41.0 // indirect
|
||||
go.opentelemetry.io/otel/metric v1.18.0 // indirect
|
||||
go.opentelemetry.io/otel/metric v1.18.0
|
||||
go.opentelemetry.io/otel/sdk v1.18.0 // indirect
|
||||
go.opentelemetry.io/otel/sdk/metric v0.41.0 // indirect
|
||||
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
|
||||
|
||||
+134
-32
@@ -13,9 +13,11 @@ import (
|
||||
"path/filepath"
|
||||
"strconv"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/h2non/filetype"
|
||||
"go.opentelemetry.io/otel/attribute"
|
||||
"go.opentelemetry.io/otel/metric"
|
||||
"go.opentelemetry.io/otel/trace"
|
||||
"golang.org/x/sys/unix"
|
||||
|
||||
@@ -26,11 +28,15 @@ import (
|
||||
type image struct {
|
||||
store string
|
||||
maxSize int64
|
||||
|
||||
m_image_get metric.Int64Counter
|
||||
m_image_post metric.Int64Counter
|
||||
m_image_error metric.Int64Counter
|
||||
}
|
||||
|
||||
const DefaultMaxSize = 500 * 1024 * 1024
|
||||
|
||||
func New(store string, maxSize int64) (a *image, err error) {
|
||||
func New(ctx context.Context, store string, maxSize int64) (a *image, err error) {
|
||||
a = &image{
|
||||
store: store,
|
||||
maxSize: DefaultMaxSize,
|
||||
@@ -44,13 +50,31 @@ func New(store string, maxSize int64) (a *image, err error) {
|
||||
return nil, fmt.Errorf("image Store location [%s] does not exist or is not writable", a.store)
|
||||
}
|
||||
|
||||
return a, nil
|
||||
m := lg.Meter(ctx)
|
||||
|
||||
var merr error
|
||||
a.m_image_get, merr = m.Int64Counter("m_image_get",
|
||||
metric.WithDescription("retrieve image from store"),
|
||||
)
|
||||
err = errors.Join(err, merr)
|
||||
|
||||
a.m_image_post, merr = m.Int64Counter("m_image_post",
|
||||
metric.WithDescription("save image to store"),
|
||||
)
|
||||
err = errors.Join(err, merr)
|
||||
|
||||
a.m_image_error, merr = m.Int64Counter("m_image_error",
|
||||
metric.WithDescription("image api error"),
|
||||
)
|
||||
err = errors.Join(err, merr)
|
||||
|
||||
|
||||
return a, err
|
||||
}
|
||||
func (a *image) RegisterHTTP(mux *http.ServeMux) {
|
||||
mux.Handle("/i", http.StripPrefix("/i", a))
|
||||
mux.Handle("/i/", http.StripPrefix("/i/", a))
|
||||
mux.Handle("3/upload", http.StripPrefix("/3/upload", a))
|
||||
|
||||
mux.Handle("/3/upload", a)
|
||||
}
|
||||
func (a *image) ServeHTTP(w http.ResponseWriter, r *http.Request) {
|
||||
ctx := r.Context()
|
||||
@@ -58,53 +82,104 @@ func (a *image) ServeHTTP(w http.ResponseWriter, r *http.Request) {
|
||||
defer span.End()
|
||||
|
||||
switch r.Method {
|
||||
case http.MethodGet:
|
||||
case http.MethodGet, http.MethodHead:
|
||||
a.m_image_get.Add(ctx, 1)
|
||||
|
||||
name := strings.TrimPrefix(r.URL.Path, "/")
|
||||
if name != "" {
|
||||
rdr, head, err := a.loadFile(ctx, name)
|
||||
if err != nil {
|
||||
a.m_image_error.Add(ctx, 1)
|
||||
writeError(w, err)
|
||||
span.RecordError(err)
|
||||
return
|
||||
}
|
||||
|
||||
defer rdr.Close()
|
||||
|
||||
w.Header().Set("X-Content-Type-Options", "nosniff")
|
||||
w.Header().Set("Accept-Ranges", "bytes")
|
||||
w.Header().Set("Content-Type", head.Mime)
|
||||
w.Header().Set("ETag", head.ETag)
|
||||
w.Header().Set("Last-Modified", head.Modified.Format(time.RFC850))
|
||||
|
||||
if r.Method == http.MethodHead {
|
||||
return
|
||||
}
|
||||
|
||||
// io.Copy(w, rdr)
|
||||
http.ServeContent(w, r, "", head.Modified, rdr)
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
a.get(ctx, w, name)
|
||||
case http.MethodPost:
|
||||
a.m_image_post.Add(ctx, 1)
|
||||
|
||||
var err error
|
||||
defer r.Body.Close()
|
||||
|
||||
var fd io.ReadCloser = r.Body
|
||||
if r.URL.Path == "/3/upload" {
|
||||
span.AddEvent("Imgur Emulation")
|
||||
if data := r.FormValue("image"); data != "" {
|
||||
var rdr io.Reader = strings.NewReader(data)
|
||||
if t := r.FormValue("type"); t == "base64" {
|
||||
rdr = base64.NewDecoder(base64.StdEncoding, rdr)
|
||||
}
|
||||
fd = io.NopCloser(rdr)
|
||||
} else if fd, _, err = r.FormFile("image"); err != nil {
|
||||
if err != nil {
|
||||
span.RecordError(err)
|
||||
w.WriteHeader(http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
defer fd.Close()
|
||||
}
|
||||
w.WriteHeader(http.StatusOK)
|
||||
} else {
|
||||
w.WriteHeader(http.StatusCreated)
|
||||
}
|
||||
|
||||
length := 0
|
||||
if h := r.Header.Get("Content-Length"); h != "" {
|
||||
if i, err := strconv.Atoi(h); err != nil {
|
||||
length = i
|
||||
}
|
||||
}
|
||||
id, err := a.put(ctx, w, r.Body, length)
|
||||
switch {
|
||||
case errors.Is(err, ErrGone):
|
||||
w.WriteHeader(http.StatusGone)
|
||||
case errors.Is(err, ErrNotFound):
|
||||
w.WriteHeader(http.StatusNotFound)
|
||||
case errors.Is(err, ErrReadingContent):
|
||||
w.WriteHeader(http.StatusInternalServerError)
|
||||
case errors.Is(err, ErrUnsupportedType):
|
||||
w.WriteHeader(http.StatusUnsupportedMediaType)
|
||||
id, err := a.put(ctx, fd, length)
|
||||
if err != nil {
|
||||
a.m_image_error.Add(ctx, 1)
|
||||
writeError(w, err)
|
||||
span.RecordError(err)
|
||||
return
|
||||
}
|
||||
|
||||
type data struct{
|
||||
type data struct {
|
||||
Link string `json:"link"`
|
||||
DeleteHash string `json:"deletehash"`
|
||||
}
|
||||
var resp = struct{
|
||||
var resp = struct {
|
||||
Data data `json:"data"`
|
||||
Success bool `json:"success"`
|
||||
Status int `json:"status"`
|
||||
}{
|
||||
Data: data{
|
||||
Link: fmt.Sprintf("https://%s/%s", r.Host, id),
|
||||
Link: fmt.Sprintf("https://%s/i/%s", r.Host, id),
|
||||
},
|
||||
Success: true,
|
||||
Status: 200,
|
||||
}
|
||||
|
||||
json.NewEncoder(w).Encode(resp)
|
||||
err = json.NewEncoder(w).Encode(resp)
|
||||
span.RecordError(err)
|
||||
|
||||
default:
|
||||
http.Error(w, http.StatusText(http.StatusNotFound), http.StatusNotFound)
|
||||
}
|
||||
}
|
||||
|
||||
func (a *image) get(ctx context.Context, w http.ResponseWriter, name string) error {
|
||||
func (a *image) loadFile(ctx context.Context, name string) (io.ReadSeekCloser, *Header, error) {
|
||||
_, span := lg.Span(ctx)
|
||||
defer span.End()
|
||||
|
||||
@@ -114,38 +189,44 @@ func (a *image) get(ctx context.Context, w http.ResponseWriter, name string) err
|
||||
fname := filepath.Join(a.store, id)
|
||||
|
||||
if !chkFile(fname) {
|
||||
return fmt.Errorf("%w: %s", ErrNotFound, fname)
|
||||
return nil, nil, fmt.Errorf("%w: %s", ErrNotFound, fname)
|
||||
}
|
||||
|
||||
if chkGone(fname) {
|
||||
return fmt.Errorf("%w: %s", ErrGone, fname)
|
||||
return nil, nil, fmt.Errorf("%w: %s", ErrGone, fname)
|
||||
}
|
||||
|
||||
f, err := os.Open(fname)
|
||||
if err != nil {
|
||||
return err
|
||||
return nil, nil, err
|
||||
}
|
||||
stat, err := f.Stat()
|
||||
if err != nil {
|
||||
return nil, nil, err
|
||||
}
|
||||
defer f.Close()
|
||||
|
||||
pr := readutil.NewPreviewReader(f)
|
||||
|
||||
mime, err := readutil.ReadMIME(pr, name)
|
||||
if err != nil {
|
||||
return err
|
||||
return nil, nil, err
|
||||
}
|
||||
w.Header().Set("Content-Type", mime)
|
||||
w.Header().Set("X-Content-Type-Options", "nosniff")
|
||||
|
||||
_, _ = io.Copy(w, pr.Drain())
|
||||
return nil
|
||||
f.Seek(0, 0)
|
||||
|
||||
return f,
|
||||
&Header{Mime: mime, Modified: stat.ModTime(), ETag: name},
|
||||
nil
|
||||
}
|
||||
|
||||
func (a *image) put(ctx context.Context, w http.ResponseWriter, r io.ReadCloser, length int) (string, error) {
|
||||
func (a *image) put(ctx context.Context, r io.ReadCloser, length int) (string, error) {
|
||||
_, span := lg.Span(ctx)
|
||||
defer span.End()
|
||||
|
||||
defer r.Close()
|
||||
|
||||
span.AddEvent("content length", trace.WithAttributes(attribute.Int64("max-size", a.maxSize), attribute.Int("length", length)))
|
||||
|
||||
if length > 0 {
|
||||
if int64(length) > a.maxSize {
|
||||
return "", ErrSizeTooLarge
|
||||
@@ -155,6 +236,7 @@ func (a *image) put(ctx context.Context, w http.ResponseWriter, r io.ReadCloser,
|
||||
rdr := io.LimitReader(r, a.maxSize)
|
||||
pr := readutil.NewPreviewReader(rdr)
|
||||
if !isImageOrVideo(pr) {
|
||||
span.AddEvent("not image")
|
||||
return "", ErrUnsupportedType
|
||||
}
|
||||
rdr = pr.Drain()
|
||||
@@ -162,6 +244,7 @@ func (a *image) put(ctx context.Context, w http.ResponseWriter, r io.ReadCloser,
|
||||
s256 := sha256.New()
|
||||
tmp, err := os.CreateTemp(a.store, "image-")
|
||||
if err != nil {
|
||||
span.RecordError(err)
|
||||
return "", fmt.Errorf("%w: %w", ErrBadInput, err)
|
||||
}
|
||||
|
||||
@@ -169,6 +252,7 @@ func (a *image) put(ctx context.Context, w http.ResponseWriter, r io.ReadCloser,
|
||||
|
||||
m := io.MultiWriter(s256, tmp)
|
||||
if _, err := io.Copy(m, rdr); err != nil {
|
||||
span.RecordError(err)
|
||||
return "", fmt.Errorf("%w: %w", ErrBadInput, err)
|
||||
}
|
||||
tmp.Close()
|
||||
@@ -176,7 +260,7 @@ func (a *image) put(ctx context.Context, w http.ResponseWriter, r io.ReadCloser,
|
||||
id := base64.RawURLEncoding.EncodeToString(s256.Sum(nil)[12:])
|
||||
fname := filepath.Join(a.store, id)
|
||||
|
||||
span.AddEvent("image: moving file", trace.WithAttributes(attribute.String("src", tmp.Name()), attribute.String("dst", fname)))
|
||||
span.AddEvent("image: moving file", trace.WithAttributes(attribute.String("image-src", tmp.Name()), attribute.String("image-dst", fname)))
|
||||
_ = os.Rename(tmp.Name(), fname)
|
||||
|
||||
return id, nil
|
||||
@@ -245,6 +329,24 @@ func chkGone(path string) bool {
|
||||
|
||||
return false
|
||||
}
|
||||
func writeError(w http.ResponseWriter, err error) {
|
||||
switch {
|
||||
case errors.Is(err, ErrGone):
|
||||
w.WriteHeader(http.StatusGone)
|
||||
case errors.Is(err, ErrNotFound):
|
||||
w.WriteHeader(http.StatusNotFound)
|
||||
case errors.Is(err, ErrReadingContent):
|
||||
w.WriteHeader(http.StatusInternalServerError)
|
||||
case errors.Is(err, ErrUnsupportedType):
|
||||
w.WriteHeader(http.StatusUnsupportedMediaType)
|
||||
}
|
||||
}
|
||||
|
||||
type Header struct {
|
||||
Mime string
|
||||
Modified time.Time
|
||||
ETag string
|
||||
}
|
||||
|
||||
var (
|
||||
ErrNotFound = errors.New("not found")
|
||||
|
||||
@@ -0,0 +1,118 @@
|
||||
package image_test
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"context"
|
||||
"encoding/base64"
|
||||
"fmt"
|
||||
"mime/multipart"
|
||||
"net/http"
|
||||
"net/http/httptest"
|
||||
"os"
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
"github.com/matryer/is"
|
||||
"go.sour.is/paste/v2/image"
|
||||
)
|
||||
|
||||
var testImage = "iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mP8z/C/HgAGgwJ/lK3Q6wAAAABJRU5ErkJggg=="
|
||||
|
||||
|
||||
func TestPostImgur(t *testing.T) {
|
||||
is := is.New(t)
|
||||
|
||||
ctx := context.Background()
|
||||
|
||||
dir, err := os.MkdirTemp("", "image")
|
||||
is.NoErr(err)
|
||||
|
||||
im, err := image.New(ctx, dir, 0)
|
||||
is.NoErr(err)
|
||||
|
||||
{
|
||||
body := &bytes.Buffer{}
|
||||
wr := multipart.NewWriter(body)
|
||||
w, err := wr.CreateFormField("type")
|
||||
is.NoErr(err)
|
||||
|
||||
fmt.Fprint(w, "base64")
|
||||
|
||||
w, err = wr.CreateFormField("image")
|
||||
is.NoErr(err)
|
||||
|
||||
fmt.Fprint(w, testImage)
|
||||
|
||||
err = wr.Close()
|
||||
is.NoErr(err)
|
||||
|
||||
t.Log(body.String())
|
||||
|
||||
req := httptest.NewRequest("POST", "/3/upload", body)
|
||||
req.Header.Set("Content-Type", "multipart/form-data; boundary="+wr.Boundary())
|
||||
res := httptest.NewRecorder()
|
||||
|
||||
im.ServeHTTP(res, req)
|
||||
|
||||
is.Equal(res.Code, http.StatusOK)
|
||||
is.Equal(res.Body.String(), `{"data":{"link":"https://example.com/i/Igg59VTi6JNuXVriXMR3U_lzfAc","deletehash":""},"success":true,"status":200}
|
||||
`)
|
||||
}
|
||||
|
||||
{
|
||||
req := httptest.NewRequest("GET", "/Igg59VTi6JNuXVriXMR3U_lzfAc", nil)
|
||||
res := httptest.NewRecorder()
|
||||
|
||||
im.ServeHTTP(res, req)
|
||||
|
||||
is.Equal(res.Code, http.StatusOK)
|
||||
|
||||
s := base64.StdEncoding.EncodeToString(res.Body.Bytes())
|
||||
is.Equal(s, testImage)
|
||||
t.Log(res.Header())
|
||||
is.Equal(res.Header().Get("ETag"), "Igg59VTi6JNuXVriXMR3U_lzfAc")
|
||||
|
||||
}
|
||||
|
||||
err = os.RemoveAll(dir)
|
||||
is.NoErr(err)
|
||||
}
|
||||
|
||||
func TestPost(t *testing.T) {
|
||||
is := is.New(t)
|
||||
|
||||
ctx := context.Background()
|
||||
|
||||
dir, err := os.MkdirTemp("", "image")
|
||||
is.NoErr(err)
|
||||
|
||||
im, err := image.New(ctx, dir, 0)
|
||||
is.NoErr(err)
|
||||
|
||||
{
|
||||
req := httptest.NewRequest("POST", "/i", base64.NewDecoder(base64.StdEncoding, strings.NewReader(testImage)))
|
||||
res := httptest.NewRecorder()
|
||||
|
||||
im.ServeHTTP(res, req)
|
||||
|
||||
is.Equal(res.Code, http.StatusCreated)
|
||||
is.Equal(res.Body.String(), `{"data":{"link":"https://example.com/i/Igg59VTi6JNuXVriXMR3U_lzfAc","deletehash":""},"success":true,"status":200}
|
||||
`)
|
||||
|
||||
}
|
||||
|
||||
{
|
||||
req := httptest.NewRequest("GET", "/Igg59VTi6JNuXVriXMR3U_lzfAc", nil)
|
||||
res := httptest.NewRecorder()
|
||||
|
||||
im.ServeHTTP(res, req)
|
||||
|
||||
is.Equal(res.Code, http.StatusOK)
|
||||
|
||||
s := base64.StdEncoding.EncodeToString(res.Body.Bytes())
|
||||
is.Equal(s, testImage)
|
||||
}
|
||||
|
||||
err = os.RemoveAll(dir)
|
||||
is.NoErr(err)
|
||||
}
|
||||
+3
-1
@@ -20,11 +20,13 @@ var _ = apps.Register(20, func(ctx context.Context, svc *service.Harness) error
|
||||
svc.Add(s)
|
||||
|
||||
mux := mux.New()
|
||||
|
||||
s.Handler = cors.AllowAll().Handler(mux)
|
||||
|
||||
hdlr := s.Handler
|
||||
s.Handler = http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
log.Println(r.Method, r.URL.Path)
|
||||
mux.ServeHTTP(w, r)
|
||||
hdlr.ServeHTTP(w, r)
|
||||
})
|
||||
|
||||
s.Addr = env.Default("HTTP_LISTEN", ":8080")
|
||||
|
||||
Reference in new issue
Block a user