assets: use statik to compile static files into binary files

Godeps/Godeps.json

@@ -16,6 +16,11 @@
 			"Comment": "0.6.2",
 			"Rev": "784ddc588536785e7299f7272f39101f7faccc3f"
 		},
+		{
+			"ImportPath": "github.com/rakyll/statik/fs",
+			"Comment": "v0.1.0",
+			"Rev": "274df120e9065bdd08eb1120e0375e3dc1ae8465"
+		},
 		{
 			"ImportPath": "github.com/vaughan0/go-ini",
 			"Rev": "a98ad7ee00ec53921f08832bc06ecf7fd600e6a1"

Makefile

@@ -1,12 +1,20 @@
 export PATH := $(GOPATH)/bin:$(PATH)
 export GO15VENDOREXPERIMENT := 1
 
-all: build
+all: fmt dep build
 
-build: fmt frps frpc build_test
+build: frps frpc build_test
 
 build_test: echo_server http_server
 
+dep: statik
+
+statik:
+	go get -d github.com/rakyll/statik
+	@go install github.com/rakyll/statik
+	@rm -rf ./src/assets/statik
+	go generate ./src/...
+
 fmt:
 	go fmt ./src/...
 	@go fmt ./test/echo_server.go
@@ -15,7 +23,7 @@ fmt:
 
 frps:
 	go build -o bin/frps ./src/cmd/frps
-	cp -rf ./assets ./bin
+	cp -rf ./src/assets/static ./bin
 
 frpc:
 	go build -o bin/frpc ./src/cmd/frpc
@@ -43,3 +51,6 @@ clean:
 	rm -f ./test/bin/echo_server
 	rm -f ./test/bin/http_server
 	cd ./test && ./clean_test.sh && cd -
+
+save:
+	godep save ./src/...

assets/static/iconfont.css

@@ -1,18 +0,0 @@
-
-@font-face {font-family: "iconfont";
-  src: url('iconfont.eot?t=1470307529'); /* IE9*/
-  src: url('iconfont.eot?t=1470307529#iefix') format('embedded-opentype'), /* IE6-IE8 */
-  url('iconfont.woff?t=1470307529') format('woff'), /* chrome, firefox */
-  url('iconfont.ttf?t=1470307529') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
-  url('iconfont.svg?t=1470307529#iconfont') format('svg'); /* iOS 4.1- */
-}
-
-.iconfont {
-  font-family:"iconfont" !important;
-  font-size:16px;
-  font-style:normal;
-  -webkit-font-smoothing: antialiased;
-  -webkit-text-stroke-width: 0.2px;
-  -moz-osx-font-smoothing: grayscale;
-}
-.icon-sort:before { content: "\e66d"; }

conf/frps.ini

@@ -8,7 +8,7 @@ vhost_https_port = 443
 # if you want to configure or reload frps by dashboard, dashboard_port must be set
 dashboard_port = 7500
 # dashboard assets directory(only for debug mode)
-assets_dir = ./assets
+# assets_dir = ./static
 # console or real logFile path like ./frps.log
 log_file = ./frps.log
 # debug, info, warn, error

src/assets/assets.go

@@ -0,0 +1,75 @@
+// Copyright 2016 fatedier, fatedier@gmail.com
+//
+// 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.
+
+package assets
+
+//go:generate statik -src=./static
+//go:generate go fmt statik/statik.go
+
+import (
+	"io/ioutil"
+	"net/http"
+	"os"
+	"path"
+
+	"github.com/rakyll/statik/fs"
+
+	_ "github.com/fatedier/frp/src/assets/statik"
+)
+
+var (
+	// store static files in memory by statik
+	FileSystem http.FileSystem
+
+	// if prefix is not empty, we get file content from disk
+	prefixPath string
+)
+
+// if path is empty, load assets in memory
+// or set FileSystem using disk files
+func Load(path string) (err error) {
+	prefixPath = path
+	if prefixPath != "" {
+		FileSystem = http.Dir(prefixPath)
+		return nil
+	} else {
+		FileSystem, err = fs.New()
+	}
+	return err
+}
+
+func ReadFile(file string) (content string, err error) {
+	if prefixPath == "" {
+		file, err := FileSystem.Open(path.Join("/", file))
+		if err != nil {
+			return content, err
+		}
+		buf, err := ioutil.ReadAll(file)
+		if err != nil {
+			return content, err
+		}
+		content = string(buf)
+	} else {
+		file, err := os.Open(path.Join(prefixPath, file))
+		if err != nil {
+			return content, err
+		}
+		buf, err := ioutil.ReadAll(file)
+		if err != nil {
+			return content, err
+		}
+		content = string(buf)
+	}
+	return content, err
+}

src/cmd/frps/main.go

@@ -26,6 +26,7 @@ import (
 
 	docopt "github.com/docopt/docopt-go"
 
+	"github.com/fatedier/frp/src/assets"
 	"github.com/fatedier/frp/src/models/server"
 	"github.com/fatedier/frp/src/utils/conn"
 	"github.com/fatedier/frp/src/utils/log"
@@ -130,6 +131,13 @@ func main() {
 
 	log.InitLog(server.LogWay, server.LogFile, server.LogLevel, server.LogMaxDays)
 
+	// init assets
+	err = assets.Load(server.AssetsDir)
+	if err != nil {
+		log.Error("Load assets error: %v", err)
+		os.Exit(1)
+	}
+
 	l, err := conn.Listen(server.BindAddr, server.BindPort)
 	if err != nil {
 		log.Error("Create server listener error, %v", err)

src/models/server/dashboard.go

@@ -19,6 +19,8 @@ import (
 	"net"
 	"net/http"
 	"time"
+
+	"github.com/fatedier/frp/src/assets"
 )
 
 var (
@@ -33,8 +35,9 @@ func RunDashboardServer(addr string, port int64) (err error) {
 	mux.HandleFunc("/api/reload", apiReload)
 	mux.HandleFunc("/api/proxies", apiProxies)
 
-	// view see dashboard_view.go
+	// view, see dashboard_view.go
-	mux.Handle("/static/", http.StripPrefix("/static/", http.FileServer(http.Dir("./assets"))))
+	mux.Handle("/favicon.ico", http.FileServer(assets.FileSystem))
+	mux.Handle("/static/", http.StripPrefix("/static/", http.FileServer(assets.FileSystem)))
 	mux.HandleFunc("/", viewDashboard)
 
 	address := fmt.Sprintf("%s:%d", addr, port)

src/models/server/dashboard_view.go

@@ -17,17 +17,22 @@ package server
 import (
 	"html/template"
 	"net/http"
-	"path"
 
+	"github.com/fatedier/frp/src/assets"
 	"github.com/fatedier/frp/src/models/metric"
 	"github.com/fatedier/frp/src/utils/log"
 )
 
 func viewDashboard(w http.ResponseWriter, r *http.Request) {
 	metrics := metric.GetAllProxyMetrics()
-	t := template.Must(template.New("index.html").Delims("<<<", ">>>").ParseFiles(path.Join(AssetsDir, "index.html")))
+	dashboardTpl, err := assets.ReadFile("index.html")
+	if err != nil {
+		http.Error(w, "get dashboard template file error", http.StatusInternalServerError)
+		return
+	}
+	t := template.Must(template.New("index.html").Delims("<<<", ">>>").Parse(dashboardTpl))
 
-	err := t.Execute(w, metrics)
+	err = t.Execute(w, metrics)
 	if err != nil {
 		log.Warn("parse template file [index.html] error: %v", err)
 		http.Error(w, "parse template file error", http.StatusInternalServerError)

vendor/github.com/rakyll/statik/LICENSE

@@ -0,0 +1,202 @@
+
+                                 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 2014 Google Inc.
+
+   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.

vendor/github.com/rakyll/statik/fs/fs.go

@@ -0,0 +1,146 @@
+// Copyright 2014 Google Inc. All Rights Reserved.
+//
+// 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.
+
+// Package contains an HTTP file system that works with zip contents.
+package fs
+
+import (
+	"archive/zip"
+	"bytes"
+	"errors"
+	"io"
+	"io/ioutil"
+	"net/http"
+	"os"
+	"strings"
+	"sync"
+)
+
+var zipData string
+
+type statikFS struct {
+	files map[string]*zip.File
+}
+
+// Registers zip contents data, later used to initialize
+// the statik file system.
+func Register(data string) {
+	zipData = data
+}
+
+// Creates a new file system with the registered zip contents data.
+func New() (http.FileSystem, error) {
+	if zipData == "" {
+		return nil, errors.New("statik/fs: No zip data registered.")
+	}
+	zipReader, err := zip.NewReader(strings.NewReader(zipData), int64(len(zipData)))
+	if err != nil {
+		return nil, err
+	}
+	files := make(map[string]*zip.File)
+	for _, file := range zipReader.File {
+		files["/"+file.Name] = file
+	}
+	return &statikFS{files: files}, nil
+}
+
+// Opens a file, unzip the contents and initializes
+// readers. Returns os.ErrNotExists if file is not
+// found in the archive.
+func (fs *statikFS) Open(name string) (http.File, error) {
+	name = strings.Replace(name, "//", "/", -1)
+	f, ok := fs.files[name]
+
+	// The file doesn't match, but maybe it's a directory,
+	// thus we should look for index.html
+	if !ok {
+		indexName := strings.Replace(name+"/index.html", "//", "/", -1)
+		f, ok = fs.files[indexName]
+
+		if !ok {
+			return nil, os.ErrNotExist
+		}
+
+		return newFile(f, true)
+	}
+	return newFile(f, false)
+}
+
+var nopCloser = ioutil.NopCloser(nil)
+
+func newFile(zf *zip.File, isDir bool) (*file, error) {
+	rc, err := zf.Open()
+	if err != nil {
+		return nil, err
+	}
+	defer rc.Close()
+	all, err := ioutil.ReadAll(rc)
+	if err != nil {
+		return nil, err
+	}
+	return &file{
+		FileInfo: zf.FileInfo(),
+		data:     all,
+		readerAt: bytes.NewReader(all),
+		Closer:   nopCloser,
+		isDir:    isDir,
+	}, nil
+}
+
+// Represents an HTTP file, acts as a bridge between
+// zip.File and http.File.
+type file struct {
+	os.FileInfo
+	io.Closer
+
+	data     []byte // non-nil if regular file
+	reader   *io.SectionReader
+	readerAt io.ReaderAt // over data
+	isDir    bool
+
+	once sync.Once
+}
+
+func (f *file) newReader() {
+	f.reader = io.NewSectionReader(f.readerAt, 0, f.FileInfo.Size())
+}
+
+// Reads bytes into p, returns the number of read bytes.
+func (f *file) Read(p []byte) (n int, err error) {
+	f.once.Do(f.newReader)
+	return f.reader.Read(p)
+}
+
+// Seeks to the offset.
+func (f *file) Seek(offset int64, whence int) (ret int64, err error) {
+	f.once.Do(f.newReader)
+	return f.reader.Seek(offset, whence)
+}
+
+// Stats the file.
+func (f *file) Stat() (os.FileInfo, error) {
+	return f, nil
+}
+
+// IsDir returns true if the file location represents a directory.
+func (f *file) IsDir() bool {
+	return f.isDir
+}
+
+// Returns an empty slice of files, directory
+// listing is disabled.
+func (f *file) Readdir(count int) ([]os.FileInfo, error) {
+	// directory listing is disabled.
+	return make([]os.FileInfo, 0), nil
+}