@@ -124,7 +124,8 @@ tls-private-key | path to tls private key | | | |||||
http-auth-user | user for basic http auth on upload | | | http-auth-user | user for basic http auth on upload | | | ||||
http-auth-pass | pass for basic http auth on upload | | | http-auth-pass | pass for basic http auth on upload | | | ||||
temp-path | path to temp folder | system temp | | temp-path | path to temp folder | system temp | | ||||
web-path | path to static web files (for development) | | | |||||
web-path | path to static web files (for development or custom front end) | | | |||||
proxy-path | path prefix when service is run behind a proxy | | | |||||
ga-key | google analytics key for the front end | | | ga-key | google analytics key for the front end | | | ||||
uservoice-key | user voice key for the front end | | | uservoice-key | user voice key for the front end | | | ||||
provider | which storage provider to use | (s3, grdrive or local) | | provider | which storage provider to use | (s3, grdrive or local) | | ||||
@@ -76,6 +76,11 @@ var globalFlags = []cli.Flag{ | |||||
Usage: "path to static web files", | Usage: "path to static web files", | ||||
Value: "", | Value: "", | ||||
}, | }, | ||||
cli.StringFlag{ | |||||
Name: "proxy-path", | |||||
Usage: "path prefix when service is run behind a proxy", | |||||
Value: "", | |||||
}, | |||||
cli.StringFlag{ | cli.StringFlag{ | ||||
Name: "ga-key", | Name: "ga-key", | ||||
Usage: "key for google analytics (front end)", | Usage: "key for google analytics (front end)", | ||||
@@ -234,6 +239,10 @@ func New() *Cmd { | |||||
options = append(options, server.WebPath(v)) | options = append(options, server.WebPath(v)) | ||||
} | } | ||||
if v := c.String("proxy-path"); v != "" { | |||||
options = append(options, server.ProxyPath(v)) | |||||
} | |||||
if v := c.String("ga-key"); v != "" { | if v := c.String("ga-key"); v != "" { | ||||
options = append(options, server.GoogleAnalytics(v)) | options = append(options, server.GoogleAnalytics(v)) | ||||
} | } | ||||
@@ -157,7 +157,7 @@ func (s *Server) previewHandler(w http.ResponseWriter, r *http.Request) { | |||||
qrCode := base64.StdEncoding.EncodeToString(png) | qrCode := base64.StdEncoding.EncodeToString(png) | ||||
hostname := getURL(r).Host | hostname := getURL(r).Host | ||||
webAddress := resolveWebAddress(r) | |||||
webAddress := resolveWebAddress(r, s.proxyPath) | |||||
data := struct { | data := struct { | ||||
ContentType string | ContentType string | ||||
@@ -197,7 +197,7 @@ func (s *Server) viewHandler(w http.ResponseWriter, r *http.Request) { | |||||
// vars := mux.Vars(r) | // vars := mux.Vars(r) | ||||
hostname := getURL(r).Host | hostname := getURL(r).Host | ||||
webAddress := resolveWebAddress(r) | |||||
webAddress := resolveWebAddress(r, s.proxyPath) | |||||
data := struct { | data := struct { | ||||
Hostname string | Hostname string | ||||
@@ -322,7 +322,7 @@ func (s *Server) postHandler(w http.ResponseWriter, r *http.Request) { | |||||
} | } | ||||
filename = url.QueryEscape(filename) | filename = url.QueryEscape(filename) | ||||
relativeURL, _ := url.Parse(path.Join(token, filename)) | |||||
relativeURL, _ := url.Parse(path.Join(s.proxyPath, token, filename)) | |||||
fmt.Fprintln(w, getURL(r).ResolveReference(relativeURL).String()) | fmt.Fprintln(w, getURL(r).ResolveReference(relativeURL).String()) | ||||
cleanTmpFile(file) | cleanTmpFile(file) | ||||
@@ -481,8 +481,8 @@ func (s *Server) putHandler(w http.ResponseWriter, r *http.Request) { | |||||
w.Header().Set("Content-Type", "text/plain") | w.Header().Set("Content-Type", "text/plain") | ||||
filename = url.QueryEscape(filename) | filename = url.QueryEscape(filename) | ||||
relativeURL, _ := url.Parse(path.Join(token, filename)) | |||||
deleteUrl, _ := url.Parse(path.Join(token, filename, metadata.DeletionToken)) | |||||
relativeURL, _ := url.Parse(path.Join(s.proxyPath, token, filename)) | |||||
deleteUrl, _ := url.Parse(path.Join(s.proxyPath, token, filename, metadata.DeletionToken)) | |||||
w.Header().Set("X-Url-Delete", resolveUrl(r, deleteUrl, true)) | w.Header().Set("X-Url-Delete", resolveUrl(r, deleteUrl, true)) | ||||
@@ -497,10 +497,37 @@ func resolveUrl(r *http.Request, u *url.URL, absolutePath bool) string { | |||||
return getURL(r).ResolveReference(u).String() | return getURL(r).ResolveReference(u).String() | ||||
} | } | ||||
func resolveWebAddress(r *http.Request) string { | |||||
func resolveKey(key, proxyPath string) string { | |||||
if strings.HasPrefix(key, "/") { | |||||
key = key[1:] | |||||
} | |||||
if strings.HasPrefix(key, proxyPath) { | |||||
key = key[len(proxyPath):] | |||||
} | |||||
key = strings.Replace(key, "\\", "/", -1) | |||||
return key | |||||
} | |||||
func resolveWebAddress(r *http.Request, proxyPath string) string { | |||||
url := getURL(r) | url := getURL(r) | ||||
return fmt.Sprintf("%s://%s", url.ResolveReference(url).Scheme, url.ResolveReference(url).Host) | |||||
var webAddress string | |||||
if len(proxyPath) == 0 { | |||||
webAddress = fmt.Sprintf("%s://%s/", | |||||
url.ResolveReference(url).Scheme, | |||||
url.ResolveReference(url).Host) | |||||
} else { | |||||
webAddress = fmt.Sprintf("%s://%s/%s", | |||||
url.ResolveReference(url).Scheme, | |||||
url.ResolveReference(url).Host, | |||||
proxyPath) | |||||
} | |||||
return webAddress | |||||
} | } | ||||
func getURL(r *http.Request) *url.URL { | func getURL(r *http.Request) *url.URL { | ||||
@@ -649,11 +676,7 @@ func (s *Server) zipHandler(w http.ResponseWriter, r *http.Request) { | |||||
zw := zip.NewWriter(w) | zw := zip.NewWriter(w) | ||||
for _, key := range strings.Split(files, ",") { | for _, key := range strings.Split(files, ",") { | ||||
if strings.HasPrefix(key, "/") { | |||||
key = key[1:] | |||||
} | |||||
key = strings.Replace(key, "\\", "/", -1) | |||||
key = resolveKey(key, s.proxyPath) | |||||
token := strings.Split(key, "/")[0] | token := strings.Split(key, "/")[0] | ||||
filename := sanitize(strings.Split(key, "/")[1]) | filename := sanitize(strings.Split(key, "/")[1]) | ||||
@@ -725,11 +748,7 @@ func (s *Server) tarGzHandler(w http.ResponseWriter, r *http.Request) { | |||||
defer zw.Close() | defer zw.Close() | ||||
for _, key := range strings.Split(files, ",") { | for _, key := range strings.Split(files, ",") { | ||||
if strings.HasPrefix(key, "/") { | |||||
key = key[1:] | |||||
} | |||||
key = strings.Replace(key, "\\", "/", -1) | |||||
key = resolveKey(key, s.proxyPath) | |||||
token := strings.Split(key, "/")[0] | token := strings.Split(key, "/")[0] | ||||
filename := sanitize(strings.Split(key, "/")[1]) | filename := sanitize(strings.Split(key, "/")[1]) | ||||
@@ -788,6 +807,8 @@ func (s *Server) tarHandler(w http.ResponseWriter, r *http.Request) { | |||||
defer zw.Close() | defer zw.Close() | ||||
for _, key := range strings.Split(files, ",") { | for _, key := range strings.Split(files, ",") { | ||||
key = resolveKey(key, s.proxyPath) | |||||
token := strings.Split(key, "/")[0] | token := strings.Split(key, "/")[0] | ||||
filename := strings.Split(key, "/")[1] | filename := strings.Split(key, "/")[1] | ||||
@@ -121,6 +121,16 @@ func WebPath(s string) OptionFn { | |||||
} | } | ||||
} | } | ||||
func ProxyPath(s string) OptionFn { | |||||
return func(srvr *Server) { | |||||
if s[len(s)-1:] != "/" { | |||||
s = s + string(filepath.Separator) | |||||
} | |||||
srvr.proxyPath = s | |||||
} | |||||
} | |||||
func TempPath(s string) OptionFn { | func TempPath(s string) OptionFn { | ||||
return func(srvr *Server) { | return func(srvr *Server) { | ||||
if s[len(s)-1:] != "/" { | if s[len(s)-1:] != "/" { | ||||
@@ -243,6 +253,7 @@ type Server struct { | |||||
tempPath string | tempPath string | ||||
webPath string | webPath string | ||||
proxyPath string | |||||
gaKey string | gaKey string | ||||
userVoiceKey string | userVoiceKey string | ||||
@@ -538,10 +538,6 @@ func (s *GDrive) Delete(token string, filename string) (err error) { | |||||
} | } | ||||
func (s *GDrive) IsNotExist(err error) bool { | func (s *GDrive) IsNotExist(err error) bool { | ||||
if err == nil { | |||||
return false | |||||
} | |||||
if err != nil { | if err != nil { | ||||
if e, ok := err.(*googleapi.Error); ok { | if e, ok := err.(*googleapi.Error); ok { | ||||
return e.Code == http.StatusNotFound | return e.Code == http.StatusNotFound | ||||
@@ -1,3 +0,0 @@ | |||||
{ | |||||
"directory": "src/bower_components" | |||||
} |
@@ -1,326 +0,0 @@ | |||||
'use strict'; | |||||
// # Globbing | |||||
// for performance reasons we're only matching one level down: | |||||
// 'test/spec/{,*/}*.js' | |||||
// use this if you want to match all subfolders: | |||||
// 'test/spec/**/*.js' | |||||
module.exports = function (grunt) { | |||||
// load all grunt tasks | |||||
require('load-grunt-tasks')(grunt); | |||||
// show elapsed time at the end | |||||
require('time-grunt')(grunt); | |||||
grunt.loadNpmTasks('grunt-npm-command'); | |||||
// configurable paths | |||||
var yeomanConfig = { | |||||
app: require('./bower.json').appPath || 'src', | |||||
dist: 'dist/' | |||||
}; | |||||
grunt.initConfig({ | |||||
yeoman: yeomanConfig, | |||||
watch: { | |||||
less: { | |||||
files: ['<%= yeoman.app %>/styles/{,*/}*.less'], | |||||
tasks: ['less'] | |||||
}, | |||||
gruntfile: { | |||||
files: ['Gruntfile.js'] | |||||
}, | |||||
includes: { | |||||
files: ['<%= yeoman.app %>/*.html', '.tmp/*.html'], | |||||
tasks: ['includes:server'] | |||||
}, | |||||
livereload: { | |||||
options: { | |||||
livereload: '<%= connect.options.livereload %>' | |||||
}, | |||||
files: [ | |||||
'<%= yeoman.app %>/*.html', | |||||
'{.tmp,<%= yeoman.app %>}/styles/{,*/}*.css', | |||||
'{.tmp,<%= yeoman.app %>}/scripts/{,*/}*.js', | |||||
'<%= yeoman.app %>/images/{,*/}*.{png,jpg,jpeg,gif,webp,svg}' | |||||
], | |||||
tasks: ['includes:server'] | |||||
} | |||||
}, | |||||
connect: { | |||||
options: { | |||||
port: 9000, | |||||
// change this to '0.0.0.0' to access the server from outside | |||||
hostname: 'localhost', | |||||
livereload: 35729 | |||||
}, | |||||
livereload: { | |||||
options: { | |||||
open: true, | |||||
base: [ | |||||
'.tmp', | |||||
'<%= yeoman.app %>' | |||||
] | |||||
} | |||||
}, | |||||
test: { | |||||
options: { | |||||
port: 9001, | |||||
base: [ | |||||
'.tmp', | |||||
'test', | |||||
'<%= yeoman.app %>' | |||||
] | |||||
} | |||||
}, | |||||
dist: { | |||||
options: { | |||||
base: '<%= yeoman.dist %>' | |||||
} | |||||
} | |||||
}, | |||||
clean: { | |||||
dist: { | |||||
files: [{ | |||||
dot: true, | |||||
src: [ | |||||
'.tmp', | |||||
'<%= yeoman.dist %>/*', | |||||
'!<%= yeoman.dist %>/.git*' | |||||
] | |||||
}] | |||||
}, | |||||
server: '.tmp' | |||||
}, | |||||
jshint: { | |||||
options: { | |||||
jshintrc: '.jshintrc', | |||||
reporter: require('jshint-stylish') | |||||
}, | |||||
all: [ | |||||
'Gruntfile.js', | |||||
'<%= yeoman.app %>/scripts/{,*/}*.js', | |||||
'!<%= yeoman.app %>/scripts/vendor/*', | |||||
'test/spec/{,*/}*.js' | |||||
] | |||||
}, | |||||
less: { | |||||
dist: { | |||||
files: { | |||||
'<%= yeoman.app %>/styles/main.css': ['<%= yeoman.app %>/styles/main.less'] | |||||
}, | |||||
options: { | |||||
sourceMap: true, | |||||
sourceMapFilename: '<%= yeoman.app %>/styles/main.css.map', | |||||
sourceMapBasepath: '<%= yeoman.app %>/', | |||||
sourceMapRootpath: '/' | |||||
} | |||||
} | |||||
}, | |||||
includes: { | |||||
build: { | |||||
cwd: '<%= yeoman.app %>', | |||||
src: ['*.html', 'includes/*.html'], | |||||
dest: '<%= yeoman.dist %>', | |||||
options: { | |||||
flatten: true, | |||||
banner: '' | |||||
} | |||||
}, | |||||
server: { | |||||
cwd: '<%= yeoman.app %>', | |||||
src: ['*.html', 'includes/*.html'], | |||||
dest: '.tmp/', | |||||
options: { | |||||
flatten: true, | |||||
banner: '' | |||||
} | |||||
} | |||||
}, | |||||
// not used since Uglify task does concat, | |||||
// but still available if needed | |||||
/*concat: { | |||||
dist: {} | |||||
},*/ | |||||
// not enabled since usemin task does concat and uglify | |||||
// check index.html to edit your build targets | |||||
// enable this task if you prefer defining your build targets here | |||||
/*uglify: { | |||||
dist: {} | |||||
},*/ | |||||
rev: { | |||||
dist: { | |||||
files: { | |||||
src: [ | |||||
'<%= yeoman.dist %>/scripts/{,*/}*.js', | |||||
'<%= yeoman.dist %>/styles/{,*/}*.css', | |||||
'<%= yeoman.dist %>/images/{,*/}*.{png,jpg,jpeg,gif,webp,svg}', | |||||
'<%= yeoman.dist %>/fonts/{,*/}*.*' | |||||
] | |||||
} | |||||
} | |||||
}, | |||||
useminPrepare: { | |||||
html: '<%= yeoman.app %>/*.html', | |||||
options: { | |||||
dest: '<%= yeoman.dist %>' | |||||
} | |||||
}, | |||||
usemin: { | |||||
html: ['<%= yeoman.dist %>/{,*/}*.html'], | |||||
css: ['<%= yeoman.dist %>/styles/{,*/}*.css'], | |||||
options: { | |||||
dirs: ['<%= yeoman.dist %>'] | |||||
} | |||||
}, | |||||
imagemin: { | |||||
dist: { | |||||
files: [{ | |||||
expand: true, | |||||
cwd: '<%= yeoman.app %>/images', | |||||
src: '{,*/}*.{png,jpg,jpeg}', | |||||
dest: '<%= yeoman.dist %>/images' | |||||
}] | |||||
} | |||||
}, | |||||
cssmin: { | |||||
dist: { | |||||
files: { | |||||
'<%= yeoman.dist %>/styles/main.css': [ | |||||
'.tmp/styles/{,*/}*.css', | |||||
'<%= yeoman.app %>/styles/{,*/}*.css' | |||||
] | |||||
} | |||||
} | |||||
}, | |||||
htmlmin: { | |||||
dist: { | |||||
options: { | |||||
/*removeCommentsFromCDATA: true, | |||||
// https://github.com/yeoman/grunt-usemin/issues/44 | |||||
//collapseWhitespace: true, | |||||
collapseBooleanAttributes: true, | |||||
removeAttributeQuotes: true, | |||||
removeRedundantAttributes: true, | |||||
useShortDoctype: true, | |||||
removeEmptyAttributes: true, | |||||
removeOptionalTags: true*/ | |||||
}, | |||||
files: [{ | |||||
expand: true, | |||||
cwd: '<%= yeoman.app %>', | |||||
src: '*.html', | |||||
dest: '<%= yeoman.dist %>' | |||||
}] | |||||
} | |||||
}, | |||||
'npm-command': { | |||||
'videojs-install': { | |||||
options: { | |||||
cwd: '<%= yeoman.app %>/bower_components/videojs/' | |||||
} | |||||
}, | |||||
'videojs-build': { | |||||
options: { | |||||
cmd: 'run-script', | |||||
args: ['build'], | |||||
cwd: '<%= yeoman.app %>/bower_components/videojs/' | |||||
} | |||||
} | |||||
} | |||||
,copy: { | |||||
dist: { | |||||
files: [{ | |||||
expand: true, | |||||
dot: true, | |||||
cwd: '<%= yeoman.app %>', | |||||
dest: '<%= yeoman.dist %>', | |||||
src: [ | |||||
'*.{ico,png,txt}', | |||||
'fonts/{,*/}*.*', | |||||
'.htaccess', | |||||
'index.txt', | |||||
'404.txt', | |||||
'images/{,*/}*.{webp,gif,svg}' | |||||
] | |||||
}] | |||||
}, | |||||
server: { | |||||
files: [{ | |||||
expand: true, | |||||
dot: true, | |||||
cwd: '<%= yeoman.app %>/bower_components/font-awesome/fonts/', | |||||
dest: '<%= yeoman.app %>/fonts/font-awesome', | |||||
src: ['*'] | |||||
}, { | |||||
expand: true, | |||||
dot: true, | |||||
cwd: '<%= yeoman.app %>/bower_components/bootstrap/dist/fonts/', | |||||
dest: '<%= yeoman.app %>/fonts/glyphicons', | |||||
src: ['*'] | |||||
}] | |||||
} | |||||
}, | |||||
concurrent: { | |||||
dist: [ | |||||
'less', | |||||
'imagemin', | |||||
'htmlmin' | |||||
] | |||||
} | |||||
}); | |||||
grunt.loadNpmTasks('grunt-npm-command'); | |||||
grunt.registerTask('serve', function (target) { | |||||
if (target === 'dist') { | |||||
return grunt.task.run(['build', 'connect:dist:keepalive']); | |||||
} | |||||
grunt.task.run([ | |||||
'clean:server', | |||||
'less', | |||||
'includes:server', | |||||
'copy:server', | |||||
'connect:livereload', | |||||
'watch' | |||||
]); | |||||
}); | |||||
grunt.registerTask('server', function () { | |||||
grunt.log.warn('The `server` task has been deprecated. Use `grunt serve` to start a server.'); | |||||
grunt.task.run(['serve']); | |||||
}); | |||||
grunt.registerTask('test', [ | |||||
'clean:server', | |||||
'less', | |||||
'copy:server', | |||||
'connect:test', | |||||
]); | |||||
grunt.registerTask('build', [ | |||||
'clean:dist', | |||||
'npm-command', | |||||
'copy:server', | |||||
'useminPrepare', | |||||
'concurrent', | |||||
'cssmin', | |||||
'concat', | |||||
'includes:build', | |||||
'uglify', | |||||
'copy', | |||||
'usemin', | |||||
]); | |||||
grunt.registerTask('default', [ | |||||
'jshint', | |||||
'test', | |||||
'build' | |||||
]); | |||||
}; |
@@ -1,41 +0,0 @@ | |||||
# transfer.sh-web | |||||
This repository contains the web frontend for [transfer.sh](https://github.com/dutchcoders/transfer.sh/). | |||||
## How to use it | |||||
You must specify `web-path`directory, pointing to `dist` generated folder (Grunt & bindata) | |||||
Sample : | |||||
``` | |||||
docker run -d -v /folder:/uploads -v /folder/dist:/webapp --publish 5000:8080 dutchcoders/transfer.sh:latest --provider local --basedir /uploads --web-path /webapp/ | |||||
``` | |||||
## Requirement | |||||
You must install first : | |||||
* Grunt | |||||
* Bower | |||||
* Go & go-bindata (go get -u github.com/shuLhan/go-bindata/...) | |||||
## Initialization | |||||
NPM | |||||
``` | |||||
npm install | |||||
``` | |||||
Bower | |||||
*Please*, specify to Bower where to install its packets via .bowerrc, to the `src/bower_components` directory | |||||
``` | |||||
bower install | |||||
``` | |||||
## Build | |||||
``` | |||||
$ grunt build | |||||
$ go generate . | |||||
``` | |||||
## Verify | |||||
You should see a `dist` directory, where all the basic .html are generated. |
@@ -1,25 +0,0 @@ | |||||
{ | |||||
"name": "transfer.sh", | |||||
"version": "0.0.0", | |||||
"moduleType": [ | |||||
"node" | |||||
], | |||||
"private": true, | |||||
"ignore": [ | |||||
"**/.*", | |||||
"node_modules", | |||||
"bower_components", | |||||
"test", | |||||
"tests" | |||||
], | |||||
"dependencies": { | |||||
"videojs": "~7.4.2", | |||||
"bootstrap": "~3.0.0", | |||||
"modernizr": "~2.6.2", | |||||
"uri.js": "~1.14.1", | |||||
"typed.js": "https://github.com/mattboldt/typed.js.git", | |||||
"realistic-typewriter.js": "https://github.com/fardjad/realistic-typewriter.js.git", | |||||
"animate.less": "*", | |||||
"jquery-waypoints": "https://github.com/imakewebthings/jquery-waypoints.git#~2.0.5" | |||||
} | |||||
} |
@@ -1,35 +0,0 @@ | |||||
{ | |||||
"name": "transfer.sh", | |||||
"version": "0.0.0", | |||||
"dependencies": { | |||||
"wiredep": "^1.8.6" | |||||
}, | |||||
"devDependencies": { | |||||
"grunt": "~0.4.5", | |||||
"grunt-concurrent": "~1.0.0", | |||||
"grunt-contrib-clean": "~0.6.0", | |||||
"grunt-contrib-concat": "~0.5.0", | |||||
"grunt-contrib-connect": "~0.8.0", | |||||
"grunt-contrib-copy": "~0.6.0", | |||||
"grunt-contrib-cssmin": "~0.10.0", | |||||
"grunt-contrib-htmlmin": "~0.3.0", | |||||
"grunt-contrib-imagemin": "0.8.1", | |||||
"grunt-contrib-jshint": "~0.10.0", | |||||
"grunt-contrib-less": "~0.11.4", | |||||
"grunt-contrib-uglify": "~0.6.0", | |||||
"grunt-contrib-watch": "~0.6.1", | |||||
"grunt-include-replace": "^2.0.0", | |||||
"grunt-includes": "^0.4.5", | |||||
"grunt-npm-command": "^0.1.2", | |||||
"grunt-rev": "~0.1.0", | |||||
"grunt-svgmin": "1.0.0", | |||||
"grunt-usemin": "~2.4.0", | |||||
"jshint-stylish": "~1.0.0", | |||||
"load-grunt-tasks": "~0.6.0", | |||||
"matchdep": "~0.3.0", | |||||
"time-grunt": "~1.0.0" | |||||
}, | |||||
"engines": { | |||||
"node": ">=0.8.0" | |||||
} | |||||
} |