+ 
- A succinct file sharing server + Simple file sharing server built with Go/Golang, Typescript, Gin, React, Boltdb, etc.
-
+
diff --git a/client/.babelrc b/client/.babelrc
deleted file mode 100644
index de40a79..0000000
--- a/client/.babelrc
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "presets": ["env", "react", "stage-0", "stage-2"]
-}
diff --git a/client/components/composite/auth_pane.jsx b/client/components/composite/auth_pane.jsx
deleted file mode 100644
index 0ba99df..0000000
--- a/client/components/composite/auth_pane.jsx
+++ /dev/null
@@ -1,145 +0,0 @@
-import React from "react";
-import { Button } from "../control/button";
-import { Input } from "../control/input";
-
-import { config } from "../../config";
-import { getIcon } from "../display/icon";
-import { makePostBody } from "../../libs/utils";
-import { styleButtonLabel } from "./info_bar";
-
-export const classLogin = "auth-pane-login";
-export const classLogout = "auth-pane-logout";
-const IconSignIn = getIcon("signIn");
-const IconSignOut = getIcon("signOut");
-const IconAngRight = getIcon("angRight");
-
-export class AuthPane extends React.PureComponent {
- constructor(props) {
- super(props);
- this.state = {
- adminId: "",
- adminPwd: ""
- };
- }
-
- onLogin = e => {
- e.preventDefault();
- this.props.onLogin(
- this.props.serverAddr,
- this.state.adminId,
- this.state.adminPwd
- );
- };
-
- onLogout = () => {
- this.props.onLogout(this.props.serverAddr);
- };
-
- onChangeAdminId = adminId => {
- this.setState({ adminId });
- };
-
- onChangeAdminPwd = adminPwd => {
- this.setState({ adminPwd });
- };
-
- render() {
- if (this.props.isLogin) {
- return (
-
- }
- label={"Logout"}
- styleLabel={styleButtonLabel}
- styleDefault={{ color: "#666" }}
- styleContainer={{ backgroundColor: "#ccc" }}
- />
-
- );
- } else {
- if (this.props.compact) {
- return (
-
- );
- } else {
- return (
-
- );
- }
- }
- }
-}
-
-AuthPane.defaultProps = {
- onLogin: () => console.error("undefined"),
- onLogout: () => console.error("undefined"),
- compact: false,
- isLogin: false,
- serverAddr: "",
- styleContainer: {},
- styleStr: ""
-};
diff --git a/client/components/composite/file_box.jsx b/client/components/composite/file_box.jsx
deleted file mode 100644
index a19f513..0000000
--- a/client/components/composite/file_box.jsx
+++ /dev/null
@@ -1,249 +0,0 @@
-import React from "react";
-import { FileBoxDetail } from "./file_box_detail";
-import { Button } from "../control/button";
-
-import { config } from "../../config";
-import { getIcon, getIconColor } from "../display/icon";
-import { getFileExt } from "../../libs/file_type";
-import { del, publishId, shadowId, setDownLimit } from "../../libs/api_share";
-
-const msgUploadOk = "Uploading is stopped and file is deleted";
-const msgUploadNok = "Fail to delete file";
-
-const styleLeft = {
- float: "left",
- padding: "1rem 0 1rem 1rem"
-};
-
-const styleRight = {
- float: "right",
- textAlign: "right",
- padding: "0rem"
-};
-
-const clear = ;
-
-const iconDesStyle = {
- display: "inline-block",
- fontSize: "0.875rem",
- lineHeight: "1rem",
- marginBottom: "0.25rem",
- maxWidth: "12rem",
- overflow: "hidden",
- textOverflow: "ellipsis",
- textDecoration: "none",
- verticalAlign: "middle",
- whiteSpace: "nowrap"
-};
-
-const descStyle = {
- fontSize: "0.75rem",
- padding: "0.75rem"
-};
-
-const otherStyle = `
-.main-pane {
- background-color: rgba(255, 255, 255, 1);
- transition: background-color 0.1s;
-}
-.main-pane:hover {
- background-color: rgba(255, 255, 255, 0.85);
- transition: background-color 0.1s;
-}
-
-.show-detail {
- opacity: 1;
- height: auto;
- transition: opacity 0.15s, height 0.5s;
-}
-
-.hide-detail {
- opacity: 0;
- height: 0;
- overflow: hidden;
- transition: opacity 0.15s, height 0.5s;
-}
-
-.main-pane a {
- color: #333;
- transition: color 1s;
-}
-.main-pane a:hover {
- color: #3498db;
- transition: color 1s;
-}
-`;
-
-const IconMore = getIcon("bars");
-const IconTimesCir = getIcon("timesCir");
-const styleIconTimesCir = {
- color: getIconColor("timesCir")
-};
-
-const iconMoreStyleStr = `
-.file-box-more {
- color: #333;
- background-color: #fff;
- transition: color 0.4s, background-color 0.4s;
-}
-
-.file-box-more:hover {
- color: #000;
- background-color: #ccc;
- transition: color 0.4s, background-color 0.4s;
-}
-`;
-
-let styleFileBox = {
- textAlign: "left",
- margin: "1px 0px",
- fontSize: "0.75rem"
-};
-
-const styleButtonContainer = {
- width: "1rem",
- height: "1rem",
- padding: "1.5rem 1rem"
-};
-
-const styleButtonIcon = {
- lineHeight: "1rem",
- height: "1rem",
- margin: "0"
-};
-
-export class FileBox extends React.PureComponent {
- constructor(props) {
- super(props);
- }
-
- onToggleDetail = () => {
- this.props.onToggleDetail(this.props.id);
- };
-
- onDelete = () => {
- del(this.props.id).then(ok => {
- if (ok) {
- this.props.onOk(msgUploadOk);
- this.props.onRefresh();
- } else {
- this.props.onError(msgUploadNok);
- }
- });
- };
-
- render() {
- const ext = getFileExt(this.props.name);
- const IconFile = getIcon(ext);
- const IconSpinner = getIcon("spinner");
-
- const styleIcon = {
- color: this.props.isLoading ? "#34495e" : getIconColor(ext)
- };
-
- styleFileBox = {
- ...styleFileBox,
- width: this.props.width
- };
-
- const fileIcon = this.props.isLoading ? (
-
- 一个小而美的文件共享服务器 + 简约的文件共享服务, 使用Go/Golang, Typescript, Gin, React, Boltdb等构建.
-
+
diff --git a/package.json b/package.json
index 09834ab..b48bf65 100644
--- a/package.json
+++ b/package.json
@@ -1,4 +1,16 @@
{
"private": true,
- "workspaces": ["src/client/web"]
+ "workspaces": [
+ "src/client/web"
+ ],
+ "scripts": {
+ "dev:setup": "yarn && yarn dev:copy-immutable && yarn dev:copy-react-dom && yarn dev:copy-react",
+ "dev:copy-immutable": "cp node_modules/immutable/dist/immutable.min.js public/static/js",
+ "dev:copy-react-dom": "cp node_modules/react-dom/umd/react-dom.development.js public/static/js",
+ "dev:copy-react": "cp node_modules/react/umd/react.development.js public/static/js",
+ "prod:setup": "yarn && yarn prod:copy-immutable && yarn prod:copy-react-dom && yarn prod:copy-react",
+ "prod:copy-immutable": "cp node_modules/immutable/dist/immutable.min.js public/static/js",
+ "prod:copy-react-dom": "cp node_modules/react-dom/umd/react-dom.production.min.js public/static/js",
+ "prod:copy-react": "cp node_modules/react/umd/react.production.min.js public/static/js"
+ }
}
diff --git a/public/index.html b/public/index.html
deleted file mode 100644
index 076dc63..0000000
--- a/public/index.html
+++ /dev/null
@@ -1,94 +0,0 @@
-
-
-
-
-
-
-
diff --git a/server.go b/server.go
deleted file mode 100644
index 5093eef..0000000
--- a/server.go
+++ /dev/null
@@ -1,45 +0,0 @@
-package main
-
-import (
- "fmt"
- "log"
- "net/http"
- "time"
-)
-
-import (
- "github.com/ihexxa/quickshare/server/apis"
- "github.com/ihexxa/quickshare/server/libs/cfg"
- "github.com/skratchdot/open-golang/open"
-)
-
-func main() {
- config := cfg.NewConfigFrom("config.json")
- srvShare := apis.NewSrvShare(config)
-
- // TODO: using httprouter instead
- mux := http.NewServeMux()
- mux.HandleFunc(config.PathLogin, srvShare.LoginHandler)
- mux.HandleFunc(config.PathStartUpload, srvShare.StartUploadHandler)
- mux.HandleFunc(config.PathUpload, srvShare.UploadHandler)
- mux.HandleFunc(config.PathFinishUpload, srvShare.FinishUploadHandler)
- mux.HandleFunc(config.PathDownload, srvShare.DownloadHandler)
- mux.HandleFunc(config.PathFileInfo, srvShare.FileInfoHandler)
- mux.HandleFunc(config.PathClient, srvShare.ClientHandler)
-
- server := &http.Server{
- Addr: fmt.Sprintf("%s:%d", config.HostName, config.Port),
- Handler: mux,
- MaxHeaderBytes: config.MaxHeaderBytes,
- ReadTimeout: time.Duration(config.ReadTimeout) * time.Millisecond,
- WriteTimeout: time.Duration(config.WriteTimeout) * time.Millisecond,
- IdleTimeout: time.Duration(config.IdleTimeout) * time.Millisecond,
- }
-
- log.Printf("quickshare starts @ %s:%d", config.HostName, config.Port)
- err := open.Start(fmt.Sprintf("http://%s:%d", config.HostName, config.Port))
- if err != nil {
- log.Println(err)
- }
- log.Fatal(server.ListenAndServe())
-}
diff --git a/server/apis/auth.go b/server/apis/auth.go
deleted file mode 100644
index 1377403..0000000
--- a/server/apis/auth.go
+++ /dev/null
@@ -1,105 +0,0 @@
-package apis
-
-import (
- "net/http"
- "time"
-)
-
-import (
- "github.com/ihexxa/quickshare/server/libs/httputil"
- "github.com/ihexxa/quickshare/server/libs/httpworker"
-)
-
-func (srv *SrvShare) LoginHandler(res http.ResponseWriter, req *http.Request) {
- if req.Method != http.MethodPost {
- srv.Http.Fill(httputil.Err404, res)
- return
- }
-
- act := req.FormValue(srv.Conf.KeyAct)
- todo := func(res http.ResponseWriter, req *http.Request) interface{} { return httputil.Err404 }
- switch act {
- case srv.Conf.ActLogin:
- todo = srv.Login
- case srv.Conf.ActLogout:
- todo = srv.Logout
- default:
- srv.Http.Fill(httputil.Err404, res)
- return
- }
-
- ack := make(chan error, 1)
- ok := srv.WorkerPool.Put(&httpworker.Task{
- Ack: ack,
- Do: srv.Wrap(todo),
- Res: res,
- Req: req,
- })
- if !ok {
- srv.Http.Fill(httputil.Err503, res)
- return
- }
-
- execErr := srv.WorkerPool.IsInTime(ack, time.Duration(srv.Conf.Timeout)*time.Millisecond)
- if srv.Err.IsErr(execErr) {
- srv.Http.Fill(httputil.Err500, res)
- }
-}
-
-func (srv *SrvShare) Login(res http.ResponseWriter, req *http.Request) interface{} {
- // all users need to pass same wall to login
- if !srv.Walls.PassIpLimit(GetRemoteIp(req.RemoteAddr)) ||
- !srv.Walls.PassOpLimit(srv.Conf.AllUsers, srv.Conf.OpIdLogin) {
- return httputil.Err504
- }
-
- return srv.login(
- req.FormValue(srv.Conf.KeyAdminId),
- req.FormValue(srv.Conf.KeyAdminPwd),
- res,
- )
-}
-
-func (srv *SrvShare) login(adminId string, adminPwd string, res http.ResponseWriter) interface{} {
- if adminId != srv.Conf.AdminId ||
- adminPwd != srv.Conf.AdminPwd {
- return httputil.Err401
- }
-
- token := srv.Walls.MakeLoginToken(srv.Conf.AdminId)
- if token == "" {
- return httputil.Err500
- }
-
- srv.Http.SetCookie(res, srv.Conf.KeyToken, token)
- return httputil.Ok200
-}
-
-func (srv *SrvShare) Logout(res http.ResponseWriter, req *http.Request) interface{} {
- srv.Http.SetCookie(res, srv.Conf.KeyToken, "-")
- return httputil.Ok200
-}
-
-func (srv *SrvShare) IsValidLength(length int64) bool {
- return length > 0 && length <= srv.Conf.MaxUpBytesPerSec
-}
-
-func (srv *SrvShare) IsValidStart(start, expectStart int64) bool {
- return start == expectStart
-}
-
-func (srv *SrvShare) IsValidShareId(shareId string) bool {
- // id could be 0 for dev environment
- if srv.Conf.Production {
- return len(shareId) == 64
- }
- return true
-}
-
-func (srv *SrvShare) IsValidDownLimit(limit int) bool {
- return limit >= -1
-}
-
-func IsValidFileName(fileName string) bool {
- return fileName != "" && len(fileName) < 240
-}
diff --git a/server/apis/auth_test.go b/server/apis/auth_test.go
deleted file mode 100644
index 1a84f78..0000000
--- a/server/apis/auth_test.go
+++ /dev/null
@@ -1,78 +0,0 @@
-package apis
-
-import (
- "fmt"
- "strings"
- "testing"
-)
-
-import (
- "github.com/ihexxa/quickshare/server/libs/cfg"
- "github.com/ihexxa/quickshare/server/libs/encrypt"
- "github.com/ihexxa/quickshare/server/libs/httputil"
-)
-
-func TestLogin(t *testing.T) {
- conf := cfg.NewConfig()
-
- type testCase struct {
- Desc string
- AdminId string
- AdminPwd string
- Result interface{}
- VerifyToken bool
- }
-
- testCases := []testCase{
- testCase{
- Desc: "invalid input",
- AdminId: "",
- AdminPwd: "",
- Result: httputil.Err401,
- VerifyToken: false,
- },
- testCase{
- Desc: "account not match",
- AdminId: "unknown",
- AdminPwd: "unknown",
- Result: httputil.Err401,
- VerifyToken: false,
- },
- testCase{
- Desc: "succeed to login",
- AdminId: conf.AdminId,
- AdminPwd: conf.AdminPwd,
- Result: httputil.Ok200,
- VerifyToken: true,
- },
- }
-
- for _, testCase := range testCases {
- srv := NewSrvShare(conf)
- res := &stubWriter{Headers: map[string][]string{}}
- ret := srv.login(testCase.AdminId, testCase.AdminPwd, res)
-
- if ret != testCase.Result {
- t.Fatalf("login: response=%v testCase=%v", ret, testCase.Result)
- }
-
- // verify cookie (only token.adminid part))
- if testCase.VerifyToken {
- cookieVal := strings.Replace(
- res.Header().Get("Set-Cookie"),
- fmt.Sprintf("%s=", conf.KeyToken),
- "",
- 1,
- )
-
- gotTokenStr := strings.Split(cookieVal, ";")[0]
- token := encrypt.JwtEncrypterMaker(conf.SecretKey)
- token.FromStr(gotTokenStr)
- gotToken, found := token.Get(conf.KeyAdminId)
- if !found || conf.AdminId != gotToken {
- t.Fatalf("login: token admin id unmatch got=%v expect=%v", gotToken, conf.AdminId)
- }
- }
-
- }
-}
diff --git a/server/apis/client.go b/server/apis/client.go
deleted file mode 100644
index 222dad4..0000000
--- a/server/apis/client.go
+++ /dev/null
@@ -1,66 +0,0 @@
-package apis
-
-import (
- "net/http"
- "path/filepath"
- "strings"
- "time"
-)
-
-import (
- "github.com/ihexxa/quickshare/server/libs/httputil"
- "github.com/ihexxa/quickshare/server/libs/httpworker"
-)
-
-func (srv *SrvShare) ClientHandler(res http.ResponseWriter, req *http.Request) {
- if req.Method != http.MethodGet {
- srv.Http.Fill(httputil.Err404, res)
- return
- }
-
- ack := make(chan error, 1)
- ok := srv.WorkerPool.Put(&httpworker.Task{
- Ack: ack,
- Do: srv.Wrap(srv.GetClient),
- Res: res,
- Req: req,
- })
- if !ok {
- srv.Http.Fill(httputil.Err503, res)
- return
- }
-
- execErr := srv.WorkerPool.IsInTime(ack, time.Duration(srv.Conf.Timeout)*time.Millisecond)
- if srv.Err.IsErr(execErr) {
- srv.Http.Fill(httputil.Err500, res)
- }
-}
-
-func (srv *SrvShare) GetClient(res http.ResponseWriter, req *http.Request) interface{} {
- if !srv.Walls.PassIpLimit(GetRemoteIp(req.RemoteAddr)) {
- return httputil.Err504
- }
-
- return srv.getClient(res, req, req.URL.EscapedPath())
-}
-
-func (srv *SrvShare) getClient(res http.ResponseWriter, req *http.Request, relPath string) interface{} {
- if strings.HasSuffix(relPath, "/") {
- relPath = relPath + "index.html"
- }
- if !IsValidClientPath(relPath) {
- return httputil.Err400
- }
-
- fullPath := filepath.Clean(filepath.Join("./public", relPath))
- http.ServeFile(res, req, fullPath)
- return 0
-}
-
-func IsValidClientPath(fullPath string) bool {
- if strings.Contains(fullPath, "..") {
- return false
- }
-
- return true
-}
diff --git a/server/apis/download.go b/server/apis/download.go
deleted file mode 100644
index f217601..0000000
--- a/server/apis/download.go
+++ /dev/null
@@ -1,69 +0,0 @@
-package apis
-
-import (
- "net/http"
- "time"
-)
-
-import (
- "github.com/ihexxa/quickshare/server/libs/fileidx"
- "github.com/ihexxa/quickshare/server/libs/httputil"
- "github.com/ihexxa/quickshare/server/libs/httpworker"
-)
-
-func (srv *SrvShare) DownloadHandler(res http.ResponseWriter, req *http.Request) {
- if req.Method != http.MethodGet {
- srv.Http.Fill(httputil.Err404, res)
- }
-
- ack := make(chan error, 1)
- ok := srv.WorkerPool.Put(&httpworker.Task{
- Ack: ack,
- Do: srv.Wrap(srv.Download),
- Res: res,
- Req: req,
- })
- if !ok {
- srv.Http.Fill(httputil.Err503, res)
- }
-
- // using WriteTimeout instead of Timeout
- // After timeout, connection will be lost, and worker will fail to write and return
- execErr := srv.WorkerPool.IsInTime(ack, time.Duration(srv.Conf.WriteTimeout)*time.Millisecond)
- if srv.Err.IsErr(execErr) {
- srv.Http.Fill(httputil.Err500, res)
- }
-}
-
-func (srv *SrvShare) Download(res http.ResponseWriter, req *http.Request) interface{} {
- shareId := req.FormValue(srv.Conf.KeyShareId)
- if !srv.Walls.PassIpLimit(GetRemoteIp(req.RemoteAddr)) ||
- !srv.Walls.PassOpLimit(shareId, srv.Conf.OpIdDownload) {
- return httputil.Err429
- }
-
- return srv.download(shareId, res, req)
-}
-
-func (srv *SrvShare) download(shareId string, res http.ResponseWriter, req *http.Request) interface{} {
- if !srv.IsValidShareId(shareId) {
- return httputil.Err400
- }
-
- fileInfo, found := srv.Index.Get(shareId)
- switch {
- case !found || fileInfo.State != fileidx.StateDone:
- return httputil.Err404
- case fileInfo.DownLimit == 0:
- return httputil.Err412
- default:
- updated, _ := srv.Index.DecrDownLimit(shareId)
- if updated != 1 {
- return httputil.Err500
- }
- }
-
- err := srv.Downloader.ServeFile(res, req, fileInfo)
- srv.Err.IsErr(err)
- return 0
-}
diff --git a/server/apis/download_test.go b/server/apis/download_test.go
deleted file mode 100644
index f8887d9..0000000
--- a/server/apis/download_test.go
+++ /dev/null
@@ -1,271 +0,0 @@
-package apis
-
-import (
- "net/http"
- "os"
- "testing"
- "time"
-)
-
-import (
- "github.com/ihexxa/quickshare/server/libs/cfg"
- "github.com/ihexxa/quickshare/server/libs/errutil"
- "github.com/ihexxa/quickshare/server/libs/fileidx"
- "github.com/ihexxa/quickshare/server/libs/httputil"
- "github.com/ihexxa/quickshare/server/libs/logutil"
- "github.com/ihexxa/quickshare/server/libs/qtube"
-)
-
-func initServiceForDownloadTest(config *cfg.Config, indexMap map[string]*fileidx.FileInfo, content string) *SrvShare {
- setDownloader := func(srv *SrvShare) {
- srv.Downloader = stubDownloader{Content: content}
- }
-
- setIndex := func(srv *SrvShare) {
- srv.Index = fileidx.NewMemFileIndexWithMap(len(indexMap), indexMap)
- }
-
- setFs := func(srv *SrvShare) {
- srv.Fs = &stubFsUtil{
- MockFile: &qtube.StubFile{
- Content: content,
- Offset: 0,
- },
- }
- }
-
- logger := logutil.NewSlog(os.Stdout, config.AppName)
- setLog := func(srv *SrvShare) {
- srv.Log = logger
- }
-
- setErr := func(srv *SrvShare) {
- srv.Err = errutil.NewErrChecker(!config.Production, logger)
- }
-
- return InitSrvShare(config, setDownloader, setIndex, setFs, setLog, setErr)
-}
-
-func TestDownload(t *testing.T) {
- conf := cfg.NewConfig()
- conf.Production = false
-
- type Init struct {
- Content string
- IndexMap map[string]*fileidx.FileInfo
- }
- type Input struct {
- ShareId string
- }
- type Output struct {
- IndexMap map[string]*fileidx.FileInfo
- Response interface{}
- Body string
- }
- type testCase struct {
- Desc string
- Init
- Input
- Output
- }
-
- testCases := []testCase{
- testCase{
- Desc: "empty file index",
- Init: Init{
- IndexMap: map[string]*fileidx.FileInfo{},
- },
- Input: Input{
- ShareId: "0",
- },
- Output: Output{
- IndexMap: map[string]*fileidx.FileInfo{},
- Response: httputil.Err404,
- },
- },
- testCase{
- Desc: "file info not found",
- Init: Init{
- IndexMap: map[string]*fileidx.FileInfo{
- "1": &fileidx.FileInfo{},
- },
- },
- Input: Input{
- ShareId: "0",
- },
- Output: Output{
- IndexMap: map[string]*fileidx.FileInfo{
- "1": &fileidx.FileInfo{},
- },
- Response: httputil.Err404,
- },
- },
- testCase{
- Desc: "file not found because of state=uploading",
- Init: Init{
- IndexMap: map[string]*fileidx.FileInfo{
- "0": &fileidx.FileInfo{
- Id: "0",
- DownLimit: 1,
- ModTime: time.Now().UnixNano(),
- PathLocal: "path",
- State: fileidx.StateUploading,
- Uploaded: 1,
- },
- },
- },
- Input: Input{
- ShareId: "0",
- },
- Output: Output{
- IndexMap: map[string]*fileidx.FileInfo{
- "0": &fileidx.FileInfo{
- Id: "0",
- DownLimit: 1,
- ModTime: time.Now().UnixNano(),
- PathLocal: "path",
- State: fileidx.StateUploading,
- Uploaded: 1,
- },
- },
- Response: httputil.Err404,
- },
- },
- testCase{
- Desc: "download failed because download limit = 0",
- Init: Init{
- IndexMap: map[string]*fileidx.FileInfo{
- "0": &fileidx.FileInfo{
- Id: "0",
- DownLimit: 0,
- ModTime: time.Now().UnixNano(),
- PathLocal: "path",
- State: fileidx.StateDone,
- Uploaded: 1,
- },
- },
- },
- Input: Input{
- ShareId: "0",
- },
- Output: Output{
- IndexMap: map[string]*fileidx.FileInfo{
- "0": &fileidx.FileInfo{
- Id: "0",
- DownLimit: 0,
- ModTime: time.Now().UnixNano(),
- PathLocal: "path",
- State: fileidx.StateDone,
- Uploaded: 1,
- },
- },
- Response: httputil.Err412,
- },
- },
- testCase{
- Desc: "succeed to download",
- Init: Init{
- Content: "content",
- IndexMap: map[string]*fileidx.FileInfo{
- "0": &fileidx.FileInfo{
- Id: "0",
- DownLimit: 1,
- ModTime: time.Now().UnixNano(),
- PathLocal: "path",
- State: fileidx.StateDone,
- Uploaded: 1,
- },
- },
- },
- Input: Input{
- ShareId: "0",
- },
- Output: Output{
- IndexMap: map[string]*fileidx.FileInfo{
- "0": &fileidx.FileInfo{
- Id: "0",
- DownLimit: 0,
- ModTime: time.Now().UnixNano(),
- PathLocal: "path",
- State: fileidx.StateDone,
- Uploaded: 1,
- },
- },
- Response: 0,
- Body: "content",
- },
- },
- testCase{
- Desc: "succeed to download DownLimit == -1",
- Init: Init{
- Content: "content",
- IndexMap: map[string]*fileidx.FileInfo{
- "0": &fileidx.FileInfo{
- Id: "0",
- DownLimit: -1,
- ModTime: time.Now().UnixNano(),
- PathLocal: "path",
- State: fileidx.StateDone,
- Uploaded: 1,
- },
- },
- },
- Input: Input{
- ShareId: "0",
- },
- Output: Output{
- IndexMap: map[string]*fileidx.FileInfo{
- "0": &fileidx.FileInfo{
- Id: "0",
- DownLimit: -1,
- ModTime: time.Now().UnixNano(),
- PathLocal: "path",
- State: fileidx.StateDone,
- Uploaded: 1,
- },
- },
- Response: 0,
- Body: "content",
- },
- },
- }
-
- for _, testCase := range testCases {
- srv := initServiceForDownloadTest(conf, testCase.Init.IndexMap, testCase.Content)
- writer := &stubWriter{Headers: map[string][]string{}}
- response := srv.download(
- testCase.ShareId,
- writer,
- &http.Request{},
- )
-
- // verify downlimit
- if !sameMap(srv.Index.List(), testCase.Output.IndexMap) {
- info, _ := srv.Index.Get(testCase.ShareId)
- t.Fatalf(
- "download: index incorrect got=%v want=%v",
- info,
- testCase.Output.IndexMap[testCase.ShareId],
- )
- }
-
- // verify response
- if response != testCase.Output.Response {
- t.Fatalf(
- "download: response incorrect response=%v testCase=%v",
- response,
- testCase.Output.Response,
- )
- }
-
- // verify writerContent
- if string(writer.Response) != testCase.Output.Body {
- t.Fatalf(
- "download: body incorrect got=%v want=%v",
- string(writer.Response),
- testCase.Output.Body,
- )
- }
-
- }
-}
diff --git a/server/apis/file_info.go b/server/apis/file_info.go
deleted file mode 100644
index 4a7df47..0000000
--- a/server/apis/file_info.go
+++ /dev/null
@@ -1,233 +0,0 @@
-package apis
-
-import (
- "fmt"
- "math/rand"
- "net/http"
- "path/filepath"
- "strconv"
- "time"
-)
-
-import (
- "github.com/ihexxa/quickshare/server/libs/fileidx"
- "github.com/ihexxa/quickshare/server/libs/httputil"
- "github.com/ihexxa/quickshare/server/libs/httpworker"
-)
-
-func (srv *SrvShare) FileInfoHandler(res http.ResponseWriter, req *http.Request) {
- tokenStr := srv.Http.GetCookie(req.Cookies(), srv.Conf.KeyToken)
- if !srv.Walls.PassIpLimit(GetRemoteIp(req.RemoteAddr)) ||
- !srv.Walls.PassLoginCheck(tokenStr, req) {
- srv.Http.Fill(httputil.Err429, res)
- return
- }
-
- todo := func(res http.ResponseWriter, req *http.Request) interface{} { return httputil.Err404 }
- switch req.Method {
- case http.MethodGet:
- todo = srv.List
- case http.MethodDelete:
- todo = srv.Del
- case http.MethodPatch:
- act := req.FormValue(srv.Conf.KeyAct)
- switch act {
- case srv.Conf.ActShadowId:
- todo = srv.ShadowId
- case srv.Conf.ActPublishId:
- todo = srv.PublishId
- case srv.Conf.ActSetDownLimit:
- todo = srv.SetDownLimit
- case srv.Conf.ActAddLocalFiles:
- todo = srv.AddLocalFiles
- default:
- srv.Http.Fill(httputil.Err404, res)
- return
- }
- default:
- srv.Http.Fill(httputil.Err404, res)
- return
- }
-
- ack := make(chan error, 1)
- ok := srv.WorkerPool.Put(&httpworker.Task{
- Ack: ack,
- Do: srv.Wrap(todo),
- Res: res,
- Req: req,
- })
- if !ok {
- srv.Http.Fill(httputil.Err503, res)
- }
-
- execErr := srv.WorkerPool.IsInTime(ack, time.Duration(srv.Conf.Timeout)*time.Millisecond)
- if srv.Err.IsErr(execErr) {
- srv.Http.Fill(httputil.Err500, res)
- }
-}
-
-type ResInfos struct {
- List []*fileidx.FileInfo
-}
-
-func (srv *SrvShare) List(res http.ResponseWriter, req *http.Request) interface{} {
- if !srv.Walls.PassOpLimit(srv.Conf.AllUsers, srv.Conf.OpIdGetFInfo) {
- return httputil.Err429
- }
-
- return srv.list()
-}
-
-func (srv *SrvShare) list() interface{} {
- infos := make([]*fileidx.FileInfo, 0)
- for _, info := range srv.Index.List() {
- infos = append(infos, info)
- }
-
- return &ResInfos{List: infos}
-}
-
-func (srv *SrvShare) Del(res http.ResponseWriter, req *http.Request) interface{} {
- shareId := req.FormValue(srv.Conf.KeyShareId)
- if !srv.Walls.PassOpLimit(shareId, srv.Conf.OpIdDelFInfo) {
- return httputil.Err504
- }
-
- return srv.del(shareId)
-}
-
-func (srv *SrvShare) del(shareId string) interface{} {
- if !srv.IsValidShareId(shareId) {
- return httputil.Err400
- }
-
- fileInfo, found := srv.Index.Get(shareId)
- if !found {
- return httputil.Err404
- }
-
- srv.Index.Del(shareId)
- fullPath := filepath.Join(srv.Conf.PathLocal, fileInfo.PathLocal)
- if !srv.Fs.DelFile(fullPath) {
- // TODO: may log file name because file not exist or delete is not authenticated
- return httputil.Err500
- }
-
- return httputil.Ok200
-}
-
-func (srv *SrvShare) ShadowId(res http.ResponseWriter, req *http.Request) interface{} {
- if !srv.Walls.PassOpLimit(srv.Conf.AllUsers, srv.Conf.OpIdOpFInfo) {
- return httputil.Err429
- }
-
- shareId := req.FormValue(srv.Conf.KeyShareId)
- return srv.shadowId(shareId)
-}
-
-func (srv *SrvShare) shadowId(shareId string) interface{} {
- if !srv.IsValidShareId(shareId) {
- return httputil.Err400
- }
-
- info, found := srv.Index.Get(shareId)
- if !found {
- return httputil.Err404
- }
-
- secretId := srv.Encryptor.Encrypt(
- []byte(fmt.Sprintf("%s%s", info.PathLocal, genPwd())),
- )
- if !srv.Index.SetId(info.Id, secretId) {
- return httputil.Err412
- }
-
- return &ShareInfo{ShareId: secretId}
-}
-
-func (srv *SrvShare) PublishId(res http.ResponseWriter, req *http.Request) interface{} {
- if !srv.Walls.PassOpLimit(srv.Conf.AllUsers, srv.Conf.OpIdOpFInfo) {
- return httputil.Err429
- }
-
- shareId := req.FormValue(srv.Conf.KeyShareId)
- return srv.publishId(shareId)
-}
-
-func (srv *SrvShare) publishId(shareId string) interface{} {
- if !srv.IsValidShareId(shareId) {
- return httputil.Err400
- }
-
- info, found := srv.Index.Get(shareId)
- if !found {
- return httputil.Err404
- }
-
- publicId := srv.Encryptor.Encrypt([]byte(info.PathLocal))
- if !srv.Index.SetId(info.Id, publicId) {
- return httputil.Err412
- }
-
- return &ShareInfo{ShareId: publicId}
-}
-
-func (srv *SrvShare) SetDownLimit(res http.ResponseWriter, req *http.Request) interface{} {
- if !srv.Walls.PassOpLimit(srv.Conf.AllUsers, srv.Conf.OpIdOpFInfo) {
- return httputil.Err429
- }
-
- shareId := req.FormValue(srv.Conf.KeyShareId)
- downLimit64, downLimitParseErr := strconv.ParseInt(req.FormValue(srv.Conf.KeyDownLimit), 10, 32)
- downLimit := int(downLimit64)
- if srv.Err.IsErr(downLimitParseErr) {
- return httputil.Err400
- }
-
- return srv.setDownLimit(shareId, downLimit)
-}
-
-func (srv *SrvShare) setDownLimit(shareId string, downLimit int) interface{} {
- if !srv.IsValidShareId(shareId) || !srv.IsValidDownLimit(downLimit) {
- return httputil.Err400
- }
-
- if !srv.Index.SetDownLimit(shareId, downLimit) {
- return httputil.Err404
- }
- return httputil.Ok200
-}
-
-func (srv *SrvShare) AddLocalFiles(res http.ResponseWriter, req *http.Request) interface{} {
- return srv.AddLocalFilesImp()
-}
-
-func (srv *SrvShare) AddLocalFilesImp() interface{} {
- infos, err := srv.Fs.Readdir(srv.Conf.PathLocal, srv.Conf.LocalFileLimit)
- if srv.Err.IsErr(err) {
- panic(fmt.Sprintf("fail to readdir: %v", err))
- }
-
- for _, info := range infos {
- info.DownLimit = srv.Conf.DownLimit
- info.State = fileidx.StateDone
- info.Id = srv.Encryptor.Encrypt([]byte(info.PathLocal))
-
- addRet := srv.Index.Add(info)
- switch {
- case addRet == 0 || addRet == -1:
- // TODO: return files not added
- continue
- case addRet == 1:
- break
- default:
- return httputil.Err500
- }
- }
-
- return httputil.Ok200
-}
-
-func genPwd() string {
- return fmt.Sprintf("%d%d%d%d", rand.Intn(10), rand.Intn(10), rand.Intn(10), rand.Intn(10))
-}
diff --git a/server/apis/file_info_test.go b/server/apis/file_info_test.go
deleted file mode 100644
index b6bf1b5..0000000
--- a/server/apis/file_info_test.go
+++ /dev/null
@@ -1,584 +0,0 @@
-package apis
-
-import (
- "os"
- "path/filepath"
- "testing"
-)
-
-import (
- "github.com/ihexxa/quickshare/server/libs/cfg"
- "github.com/ihexxa/quickshare/server/libs/errutil"
- "github.com/ihexxa/quickshare/server/libs/fileidx"
- "github.com/ihexxa/quickshare/server/libs/httputil"
- "github.com/ihexxa/quickshare/server/libs/logutil"
-)
-
-const mockShadowId = "shadowId"
-const mockPublicId = "publicId"
-
-func initServiceForFileInfoTest(
- config *cfg.Config,
- indexMap map[string]*fileidx.FileInfo,
- useShadowEnc bool,
- localFileInfos []*fileidx.FileInfo,
-) *SrvShare {
- setIndex := func(srv *SrvShare) {
- srv.Index = fileidx.NewMemFileIndexWithMap(len(indexMap), indexMap)
- }
-
- setFs := func(srv *SrvShare) {
- srv.Fs = &stubFsUtil{MockLocalFileInfos: localFileInfos}
- }
-
- logger := logutil.NewSlog(os.Stdout, config.AppName)
- setLog := func(srv *SrvShare) {
- srv.Log = logger
- }
-
- errChecker := errutil.NewErrChecker(!config.Production, logger)
- setErr := func(srv *SrvShare) {
- srv.Err = errChecker
- }
-
- var setEncryptor AddDep
- if useShadowEnc {
- setEncryptor = func(srv *SrvShare) {
- srv.Encryptor = &stubEncryptor{MockResult: mockShadowId}
- }
- } else {
- setEncryptor = func(srv *SrvShare) {
- srv.Encryptor = &stubEncryptor{MockResult: mockPublicId}
- }
- }
-
- return InitSrvShare(config, setIndex, setFs, setEncryptor, setLog, setErr)
-}
-
-func TestList(t *testing.T) {
- conf := cfg.NewConfig()
- conf.Production = false
-
- type Output struct {
- IndexMap map[string]*fileidx.FileInfo
- }
- type TestCase struct {
- Desc string
- Output
- }
-
- testCases := []TestCase{
- TestCase{
- Desc: "success",
- Output: Output{
- IndexMap: map[string]*fileidx.FileInfo{
- "0": &fileidx.FileInfo{
- Id: "0",
- },
- "1": &fileidx.FileInfo{
- Id: "1",
- },
- },
- },
- },
- }
-
- for _, testCase := range testCases {
- srv := initServiceForFileInfoTest(conf, testCase.Output.IndexMap, true, []*fileidx.FileInfo{})
- response := srv.list()
- resInfos := response.(*ResInfos)
-
- for _, info := range resInfos.List {
- infoFromSrv, found := srv.Index.Get(info.Id)
- if !found || infoFromSrv.Id != info.Id {
- t.Fatalf("list: file infos are not identical")
- }
- }
-
- if len(resInfos.List) != len(srv.Index.List()) {
- t.Fatalf("list: file infos are not identical")
- }
- }
-}
-
-func TestDel(t *testing.T) {
- conf := cfg.NewConfig()
- conf.Production = false
-
- type Init struct {
- IndexMap map[string]*fileidx.FileInfo
- }
- type Input struct {
- ShareId string
- }
- type Output struct {
- IndexMap map[string]*fileidx.FileInfo
- Response httputil.MsgRes
- }
- type TestCase struct {
- Desc string
- Init
- Input
- Output
- }
-
- testCases := []TestCase{
- TestCase{
- Desc: "success",
- Init: Init{
- IndexMap: map[string]*fileidx.FileInfo{
- "0": &fileidx.FileInfo{
- Id: "0",
- },
- "1": &fileidx.FileInfo{
- Id: "1",
- },
- },
- },
- Input: Input{
- ShareId: "0",
- },
- Output: Output{
- IndexMap: map[string]*fileidx.FileInfo{
- "1": &fileidx.FileInfo{
- Id: "1",
- },
- },
- Response: httputil.Ok200,
- },
- },
- TestCase{
- Desc: "not found",
- Init: Init{
- IndexMap: map[string]*fileidx.FileInfo{
- "1": &fileidx.FileInfo{
- Id: "1",
- },
- },
- },
- Input: Input{
- ShareId: "0",
- },
- Output: Output{
- IndexMap: map[string]*fileidx.FileInfo{
- "1": &fileidx.FileInfo{
- Id: "1",
- },
- },
- Response: httputil.Err404,
- },
- },
- }
-
- for _, testCase := range testCases {
- srv := initServiceForFileInfoTest(conf, testCase.Init.IndexMap, true, []*fileidx.FileInfo{})
- response := srv.del(testCase.ShareId)
- res := response.(httputil.MsgRes)
-
- if !sameMap(srv.Index.List(), testCase.Output.IndexMap) {
- t.Fatalf("del: index incorrect")
- }
-
- if res != testCase.Output.Response {
- t.Fatalf("del: response incorrect got: %v, want: %v", res, testCase.Output.Response)
- }
- }
-}
-
-func TestShadowId(t *testing.T) {
- conf := cfg.NewConfig()
- conf.Production = false
-
- type Init struct {
- IndexMap map[string]*fileidx.FileInfo
- }
- type Input struct {
- ShareId string
- }
- type Output struct {
- IndexMap map[string]*fileidx.FileInfo
- Response interface{}
- }
- type TestCase struct {
- Desc string
- Init
- Input
- Output
- }
-
- testCases := []TestCase{
- TestCase{
- Desc: "success",
- Init: Init{
- IndexMap: map[string]*fileidx.FileInfo{
- "0": &fileidx.FileInfo{
- Id: "0",
- },
- },
- },
- Input: Input{
- ShareId: "0",
- },
- Output: Output{
- IndexMap: map[string]*fileidx.FileInfo{
- mockShadowId: &fileidx.FileInfo{
- Id: mockShadowId,
- },
- },
- Response: &ShareInfo{
- ShareId: mockShadowId,
- },
- },
- },
- TestCase{
- Desc: "original id not exists",
- Init: Init{
- IndexMap: map[string]*fileidx.FileInfo{},
- },
- Input: Input{
- ShareId: "0",
- },
- Output: Output{
- IndexMap: map[string]*fileidx.FileInfo{},
- Response: httputil.Err404,
- },
- },
- TestCase{
- Desc: "dest id exists",
- Init: Init{
- IndexMap: map[string]*fileidx.FileInfo{
- "0": &fileidx.FileInfo{
- Id: "0",
- },
- mockShadowId: &fileidx.FileInfo{
- Id: mockShadowId,
- },
- },
- },
- Input: Input{
- ShareId: "0",
- },
- Output: Output{
- IndexMap: map[string]*fileidx.FileInfo{
- "0": &fileidx.FileInfo{
- Id: "0",
- },
- mockShadowId: &fileidx.FileInfo{
- Id: mockShadowId,
- },
- },
- Response: httputil.Err412,
- },
- },
- }
-
- for _, testCase := range testCases {
- srv := initServiceForFileInfoTest(conf, testCase.Init.IndexMap, true, []*fileidx.FileInfo{})
- response := srv.shadowId(testCase.ShareId)
-
- switch response.(type) {
- case *ShareInfo:
- res := response.(*ShareInfo)
-
- if !sameMap(srv.Index.List(), testCase.Output.IndexMap) {
- info, found := srv.Index.Get(mockShadowId)
- t.Fatalf(
- "shadowId: index incorrect got %v found: %v want %v",
- info,
- found,
- testCase.Output.IndexMap[mockShadowId],
- )
- }
-
- if res.ShareId != mockShadowId {
- t.Fatalf("shadowId: mockId incorrect")
- }
-
- case httputil.MsgRes:
- res := response.(httputil.MsgRes)
-
- if !sameMap(srv.Index.List(), testCase.Output.IndexMap) {
- t.Fatalf("shadowId: map not identical")
- }
-
- if res != testCase.Output.Response {
- t.Fatalf("shadowId: response incorrect")
- }
- default:
- t.Fatalf("shadowId: return type not found")
- }
- }
-}
-
-func TestPublishId(t *testing.T) {
- conf := cfg.NewConfig()
- conf.Production = false
-
- type Init struct {
- IndexMap map[string]*fileidx.FileInfo
- }
- type Input struct {
- ShareId string
- }
- type Output struct {
- IndexMap map[string]*fileidx.FileInfo
- Response interface{}
- }
- type TestCase struct {
- Desc string
- Init
- Input
- Output
- }
-
- testCases := []TestCase{
- TestCase{
- Desc: "success",
- Init: Init{
- IndexMap: map[string]*fileidx.FileInfo{
- mockShadowId: &fileidx.FileInfo{
- Id: mockShadowId,
- },
- },
- },
- Input: Input{
- ShareId: mockShadowId,
- },
- Output: Output{
- IndexMap: map[string]*fileidx.FileInfo{
- mockPublicId: &fileidx.FileInfo{
- Id: mockPublicId,
- },
- },
- Response: &ShareInfo{
- ShareId: mockPublicId,
- },
- },
- },
- TestCase{
- Desc: "original id not exists",
- Init: Init{
- IndexMap: map[string]*fileidx.FileInfo{},
- },
- Input: Input{
- ShareId: "0",
- },
- Output: Output{
- IndexMap: map[string]*fileidx.FileInfo{},
- Response: httputil.Err404,
- },
- },
- TestCase{
- Desc: "dest id exists",
- Init: Init{
- IndexMap: map[string]*fileidx.FileInfo{
- mockShadowId: &fileidx.FileInfo{
- Id: mockShadowId,
- },
- mockPublicId: &fileidx.FileInfo{
- Id: mockPublicId,
- },
- },
- },
- Input: Input{
- ShareId: mockShadowId,
- },
- Output: Output{
- IndexMap: map[string]*fileidx.FileInfo{
- mockShadowId: &fileidx.FileInfo{
- Id: mockShadowId,
- },
- mockPublicId: &fileidx.FileInfo{
- Id: mockPublicId,
- },
- },
- Response: httputil.Err412,
- },
- },
- }
-
- for _, testCase := range testCases {
- srv := initServiceForFileInfoTest(conf, testCase.Init.IndexMap, false, []*fileidx.FileInfo{})
- response := srv.publishId(testCase.ShareId)
-
- switch response.(type) {
- case *ShareInfo:
- res := response.(*ShareInfo)
-
- if !sameMap(srv.Index.List(), testCase.Output.IndexMap) {
- info, found := srv.Index.Get(mockPublicId)
- t.Fatalf(
- "shadowId: index incorrect got %v found: %v want %v",
- info,
- found,
- testCase.Output.IndexMap[mockPublicId],
- )
- }
-
- if res.ShareId != mockPublicId {
- t.Fatalf("shadowId: mockId incorrect %v %v", res.ShareId, mockPublicId)
- }
-
- case httputil.MsgRes:
- res := response.(httputil.MsgRes)
-
- if !sameMap(srv.Index.List(), testCase.Output.IndexMap) {
- t.Fatalf("shadowId: map not identical")
- }
-
- if res != testCase.Output.Response {
- t.Fatalf("shadowId: response incorrect got: %v want: %v", res, testCase.Output.Response)
- }
- default:
- t.Fatalf("shadowId: return type not found")
- }
- }
-}
-
-func TestSetDownLimit(t *testing.T) {
- conf := cfg.NewConfig()
- conf.Production = false
- mockDownLimit := 100
-
- type Init struct {
- IndexMap map[string]*fileidx.FileInfo
- }
- type Input struct {
- ShareId string
- DownLimit int
- }
- type Output struct {
- IndexMap map[string]*fileidx.FileInfo
- Response httputil.MsgRes
- }
- type TestCase struct {
- Desc string
- Init
- Input
- Output
- }
-
- testCases := []TestCase{
- TestCase{
- Desc: "success",
- Init: Init{
- IndexMap: map[string]*fileidx.FileInfo{
- "0": &fileidx.FileInfo{
- Id: "0",
- },
- },
- },
- Input: Input{
- ShareId: "0",
- DownLimit: mockDownLimit,
- },
- Output: Output{
- IndexMap: map[string]*fileidx.FileInfo{
- "0": &fileidx.FileInfo{
- Id: "0",
- DownLimit: mockDownLimit,
- },
- },
- Response: httputil.Ok200,
- },
- },
- TestCase{
- Desc: "not found",
- Init: Init{
- IndexMap: map[string]*fileidx.FileInfo{},
- },
- Input: Input{
- ShareId: "0",
- },
- Output: Output{
- IndexMap: map[string]*fileidx.FileInfo{},
- Response: httputil.Err404,
- },
- },
- }
-
- for _, testCase := range testCases {
- srv := initServiceForFileInfoTest(conf, testCase.Init.IndexMap, true, []*fileidx.FileInfo{})
- response := srv.setDownLimit(testCase.ShareId, mockDownLimit)
- res := response.(httputil.MsgRes)
-
- if !sameMap(srv.Index.List(), testCase.Output.IndexMap) {
- info, _ := srv.Index.Get(testCase.ShareId)
- t.Fatalf(
- "setDownLimit: index incorrect got: %v want: %v",
- info,
- testCase.Output.IndexMap[testCase.ShareId],
- )
- }
-
- if res != testCase.Output.Response {
- t.Fatalf("setDownLimit: response incorrect got: %v, want: %v", res, testCase.Output.Response)
- }
- }
-}
-
-func TestAddLocalFiles(t *testing.T) {
- conf := cfg.NewConfig()
- conf.Production = false
-
- type Init struct {
- Infos []*fileidx.FileInfo
- }
- type Output struct {
- IndexMap map[string]*fileidx.FileInfo
- Response httputil.MsgRes
- }
- type TestCase struct {
- Desc string
- Init
- Output
- }
-
- testCases := []TestCase{
- TestCase{
- Desc: "success",
- Init: Init{
- Infos: []*fileidx.FileInfo{
- &fileidx.FileInfo{
- Id: "",
- DownLimit: 0,
- ModTime: 13,
- PathLocal: "filename1",
- State: "",
- Uploaded: 13,
- },
- },
- },
- Output: Output{
- IndexMap: map[string]*fileidx.FileInfo{
- mockPublicId: &fileidx.FileInfo{
- Id: mockPublicId,
- DownLimit: conf.DownLimit,
- ModTime: 13,
- PathLocal: filepath.Join(conf.PathLocal, "filename1"),
- State: fileidx.StateDone,
- Uploaded: 13,
- },
- },
- },
- },
- }
-
- for _, testCase := range testCases {
- srv := initServiceForFileInfoTest(conf, testCase.Output.IndexMap, false, testCase.Init.Infos)
- response := srv.AddLocalFilesImp()
- res := response.(httputil.MsgRes)
-
- if res.Code != 200 {
- t.Fatalf("addLocalFiles: code not correct")
- }
-
- if !sameMap(srv.Index.List(), testCase.Output.IndexMap) {
- t.Fatalf(
- "addLocalFiles: indexes not identical got: %v want: %v",
- srv.Index.List(),
- testCase.Output.IndexMap,
- )
- }
- }
-}
diff --git a/server/apis/service.go b/server/apis/service.go
deleted file mode 100644
index 912b50b..0000000
--- a/server/apis/service.go
+++ /dev/null
@@ -1,145 +0,0 @@
-package apis
-
-import (
- "log"
- "net/http"
- "os"
- "strings"
-)
-
-import (
- "github.com/ihexxa/quickshare/server/libs/cfg"
- "github.com/ihexxa/quickshare/server/libs/encrypt"
- "github.com/ihexxa/quickshare/server/libs/errutil"
- "github.com/ihexxa/quickshare/server/libs/fileidx"
- "github.com/ihexxa/quickshare/server/libs/fsutil"
- "github.com/ihexxa/quickshare/server/libs/httputil"
- "github.com/ihexxa/quickshare/server/libs/httpworker"
- "github.com/ihexxa/quickshare/server/libs/limiter"
- "github.com/ihexxa/quickshare/server/libs/logutil"
- "github.com/ihexxa/quickshare/server/libs/qtube"
- "github.com/ihexxa/quickshare/server/libs/walls"
-)
-
-type AddDep func(*SrvShare)
-
-func NewSrvShare(config *cfg.Config) *SrvShare {
- logger := logutil.NewSlog(os.Stdout, config.AppName)
- setLog := func(srv *SrvShare) {
- srv.Log = logger
- }
-
- errChecker := errutil.NewErrChecker(!config.Production, logger)
- setErr := func(srv *SrvShare) {
- srv.Err = errChecker
- }
-
- setWorkerPool := func(srv *SrvShare) {
- workerPoolSize := config.WorkerPoolSize
- taskQueueSize := config.TaskQueueSize
- srv.WorkerPool = httpworker.NewWorkerPool(workerPoolSize, taskQueueSize, logger)
- }
-
- setWalls := func(srv *SrvShare) {
- encrypterMaker := encrypt.JwtEncrypterMaker
- ipLimiter := limiter.NewRateLimiter(
- config.LimiterCap,
- config.LimiterTtl,
- config.LimiterCyc,
- config.BucketCap,
- config.SpecialCaps,
- )
- opLimiter := limiter.NewRateLimiter(
- config.LimiterCap,
- config.LimiterTtl,
- config.LimiterCyc,
- config.BucketCap,
- config.SpecialCaps,
- )
- srv.Walls = walls.NewAccessWalls(config, ipLimiter, opLimiter, encrypterMaker)
- }
-
- setIndex := func(srv *SrvShare) {
- srv.Index = fileidx.NewMemFileIndex(config.MaxShares)
- }
-
- fs := fsutil.NewSimpleFs(errChecker)
- setFs := func(srv *SrvShare) {
- srv.Fs = fs
- }
-
- setDownloader := func(srv *SrvShare) {
- srv.Downloader = qtube.NewQTube(
- config.PathLocal,
- config.MaxDownBytesPerSec,
- config.MaxRangeLength,
- fs,
- )
- }
-
- setEncryptor := func(srv *SrvShare) {
- srv.Encryptor = &encrypt.HmacEncryptor{Key: config.SecretKeyByte}
- }
-
- setHttp := func(srv *SrvShare) {
- srv.Http = &httputil.QHttpUtil{
- CookieDomain: config.CookieDomain,
- CookieHttpOnly: config.CookieHttpOnly,
- CookieMaxAge: config.CookieMaxAge,
- CookiePath: config.CookiePath,
- CookieSecure: config.CookieSecure,
- Err: errChecker,
- }
- }
-
- return InitSrvShare(config, setIndex, setWalls, setWorkerPool, setFs, setDownloader, setEncryptor, setLog, setErr, setHttp)
-}
-
-func InitSrvShare(config *cfg.Config, addDeps ...AddDep) *SrvShare {
- srv := &SrvShare{}
- srv.Conf = config
- for _, addDep := range addDeps {
- addDep(srv)
- }
-
- if !srv.Fs.MkdirAll(srv.Conf.PathLocal, os.FileMode(0775)) {
- panic("fail to make ./files/ folder")
- }
-
- if res := srv.AddLocalFilesImp(); res != httputil.Ok200 {
- panic("fail to add local files")
- }
-
- return srv
-}
-
-type SrvShare struct {
- Conf *cfg.Config
- Encryptor encrypt.Encryptor
- Err errutil.ErrUtil
- Downloader qtube.Downloader
- Http httputil.HttpUtil
- Index fileidx.FileIndex
- Fs fsutil.FsUtil
- Log logutil.LogUtil
- Walls walls.Walls
- WorkerPool httpworker.Workers
-}
-
-func (srv *SrvShare) Wrap(serviceFunc httpworker.ServiceFunc) httpworker.DoFunc {
- return func(res http.ResponseWriter, req *http.Request) {
- body := serviceFunc(res, req)
-
- if body != nil && body != 0 && srv.Http.Fill(body, res) <= 0 {
- log.Println("Wrap: fail to fill body", body, res)
- }
- }
-}
-
-func GetRemoteIp(addr string) string {
- addrParts := strings.Split(addr, ":")
- if len(addrParts) > 0 {
- return addrParts[0]
- }
- return "unknown ip"
-}
diff --git a/server/apis/test_helper.go b/server/apis/test_helper.go
deleted file mode 100644
index a23c372..0000000
--- a/server/apis/test_helper.go
+++ /dev/null
@@ -1,117 +0,0 @@
-package apis
-
-import (
- "fmt"
- "io"
- "net/http"
- "os"
-)
-
-import (
- "github.com/ihexxa/quickshare/server/libs/fileidx"
- "github.com/ihexxa/quickshare/server/libs/qtube"
-)
-
-type stubFsUtil struct {
- MockLocalFileInfos []*fileidx.FileInfo
- MockFile *qtube.StubFile
-}
-
-var expectCreateFileName = ""
-
-func (fs *stubFsUtil) CreateFile(fileName string) error {
- if fileName != expectCreateFileName {
- panic(
- fmt.Sprintf("CreateFile: got: %s expect: %s", fileName, expectCreateFileName),
- )
- }
- return nil
-}
-
-func (fs *stubFsUtil) CopyChunkN(fullPath string, chunk io.Reader, start int64, len int64) bool {
- return true
-}
-
-func (fs *stubFsUtil) ServeFile(res http.ResponseWriter, req *http.Request, fileName string) {
- return
-}
-
-func (fs *stubFsUtil) DelFile(fullPath string) bool {
- return true
-}
-
-func (fs *stubFsUtil) MkdirAll(path string, mode os.FileMode) bool {
- return true
-}
-
-func (fs *stubFsUtil) Readdir(dirname string, n int) ([]*fileidx.FileInfo, error) {
- return fs.MockLocalFileInfos, nil
-}
-
-func (fs *stubFsUtil) Open(filePath string) (qtube.ReadSeekCloser, error) {
- return fs.MockFile, nil
-}
-
-type stubWriter struct {
- Headers http.Header
- Response []byte
- StatusCode int
-}
-
-func (w *stubWriter) Header() http.Header {
- return w.Headers
-}
-
-func (w *stubWriter) Write(body []byte) (int, error) {
- w.Response = append(w.Response, body...)
- return len(body), nil
-}
-
-func (w *stubWriter) WriteHeader(statusCode int) {
- w.StatusCode = statusCode
-}
-
-type stubDownloader struct {
- Content string
-}
-
-func (d stubDownloader) ServeFile(w http.ResponseWriter, r *http.Request, fileInfo *fileidx.FileInfo) error {
- _, err := w.Write([]byte(d.Content))
- return err
-}
-
-func sameInfoWithoutTime(info1, info2 *fileidx.FileInfo) bool {
- return info1.Id == info2.Id &&
- info1.DownLimit == info2.DownLimit &&
- info1.PathLocal == info2.PathLocal &&
- info1.State == info2.State &&
- info1.Uploaded == info2.Uploaded
-}
-
-func sameMap(map1, map2 map[string]*fileidx.FileInfo) bool {
- for key, info1 := range map1 {
- info2, found := map2[key]
- if !found || !sameInfoWithoutTime(info1, info2) {
- fmt.Printf("infos are not same: \n%v \n%v", info1, info2)
- return false
- }
- }
-
- for key, info2 := range map2 {
- info1, found := map1[key]
- if !found || !sameInfoWithoutTime(info1, info2) {
- fmt.Printf("infos are not same: \n%v \n%v", info1, info2)
- return false
- }
- }
-
- return true
-}
-
-type stubEncryptor struct {
- MockResult string
-}
-
-func (enc *stubEncryptor) Encrypt(content []byte) string {
- return enc.MockResult
-}
diff --git a/server/apis/upload.go b/server/apis/upload.go
deleted file mode 100644
index 3878ce6..0000000
--- a/server/apis/upload.go
+++ /dev/null
@@ -1,250 +0,0 @@
-package apis
-
-import (
- "io"
- "net/http"
- "path/filepath"
- "strconv"
- "time"
-)
-
-import (
- "github.com/ihexxa/quickshare/server/libs/encrypt"
- "github.com/ihexxa/quickshare/server/libs/fileidx"
- "github.com/ihexxa/quickshare/server/libs/fsutil"
- "github.com/ihexxa/quickshare/server/libs/httputil"
- "github.com/ihexxa/quickshare/server/libs/httpworker"
-)
-
-const DefaultId = "0"
-
-type ByteRange struct {
- ShareId string
- Start int64
- Length int64
-}
-
-type ShareInfo struct {
- ShareId string
-}
-
-func (srv *SrvShare) StartUploadHandler(res http.ResponseWriter, req *http.Request) {
- if req.Method != http.MethodPost {
- srv.Http.Fill(httputil.Err404, res)
- return
- }
-
- tokenStr := srv.Http.GetCookie(req.Cookies(), srv.Conf.KeyToken)
- ipPass := srv.Walls.PassIpLimit(GetRemoteIp(req.RemoteAddr))
- loginPass := srv.Walls.PassLoginCheck(tokenStr, req)
- opPass := srv.Walls.PassOpLimit(GetRemoteIp(req.RemoteAddr), srv.Conf.OpIdUpload)
- if !ipPass || !loginPass || !opPass {
- srv.Http.Fill(httputil.Err429, res)
- return
- }
-
- ack := make(chan error, 1)
- ok := srv.WorkerPool.Put(&httpworker.Task{
- Ack: ack,
- Do: srv.Wrap(srv.StartUpload),
- Res: res,
- Req: req,
- })
- if !ok {
- srv.Http.Fill(httputil.Err503, res)
- }
-
- execErr := srv.WorkerPool.IsInTime(ack, time.Duration(srv.Conf.Timeout)*time.Millisecond)
- if srv.Err.IsErr(execErr) {
- srv.Http.Fill(httputil.Err500, res)
- }
-}
-
-func (srv *SrvShare) UploadHandler(res http.ResponseWriter, req *http.Request) {
- if req.Method != http.MethodPost {
- srv.Http.Fill(httputil.Err404, res)
- return
- }
-
- tokenStr := srv.Http.GetCookie(req.Cookies(), srv.Conf.KeyToken)
- ipPass := srv.Walls.PassIpLimit(GetRemoteIp(req.RemoteAddr))
- loginPass := srv.Walls.PassLoginCheck(tokenStr, req)
- opPass := srv.Walls.PassOpLimit(GetRemoteIp(req.RemoteAddr), srv.Conf.OpIdUpload)
- if !ipPass || !loginPass || !opPass {
- srv.Http.Fill(httputil.Err429, res)
- return
- }
-
- multiFormErr := req.ParseMultipartForm(srv.Conf.ParseFormBufSize)
- if srv.Err.IsErr(multiFormErr) {
- srv.Http.Fill(httputil.Err400, res)
- return
- }
-
- ack := make(chan error, 1)
- ok := srv.WorkerPool.Put(&httpworker.Task{
- Ack: ack,
- Do: srv.Wrap(srv.Upload),
- Res: res,
- Req: req,
- })
- if !ok {
- srv.Http.Fill(httputil.Err503, res)
- }
-
- execErr := srv.WorkerPool.IsInTime(ack, time.Duration(srv.Conf.Timeout)*time.Millisecond)
- if srv.Err.IsErr(execErr) {
- srv.Http.Fill(httputil.Err500, res)
- }
-}
-
-func (srv *SrvShare) FinishUploadHandler(res http.ResponseWriter, req *http.Request) {
- if req.Method != http.MethodPost {
- srv.Http.Fill(httputil.Err404, res)
- return
- }
-
- tokenStr := srv.Http.GetCookie(req.Cookies(), srv.Conf.KeyToken)
- ipPass := srv.Walls.PassIpLimit(GetRemoteIp(req.RemoteAddr))
- loginPass := srv.Walls.PassLoginCheck(tokenStr, req)
- opPass := srv.Walls.PassOpLimit(GetRemoteIp(req.RemoteAddr), srv.Conf.OpIdUpload)
- if !ipPass || !loginPass || !opPass {
- srv.Http.Fill(httputil.Err429, res)
- return
- }
-
- ack := make(chan error, 1)
- ok := srv.WorkerPool.Put(&httpworker.Task{
- Ack: ack,
- Do: srv.Wrap(srv.FinishUpload),
- Res: res,
- Req: req,
- })
- if !ok {
- srv.Http.Fill(httputil.Err503, res)
- }
-
- execErr := srv.WorkerPool.IsInTime(ack, time.Duration(srv.Conf.Timeout)*time.Millisecond)
- if srv.Err.IsErr(execErr) {
- srv.Http.Fill(httputil.Err500, res)
- }
-}
-
-func (srv *SrvShare) StartUpload(res http.ResponseWriter, req *http.Request) interface{} {
- return srv.startUpload(req.FormValue(srv.Conf.KeyFileName))
-}
-
-func (srv *SrvShare) startUpload(fileName string) interface{} {
- if !IsValidFileName(fileName) {
- return httputil.Err400
- }
-
- id := DefaultId
- if srv.Conf.Production {
- id = genInfoId(fileName, srv.Conf.SecretKeyByte)
- }
-
- info := &fileidx.FileInfo{
- Id: id,
- DownLimit: srv.Conf.DownLimit,
- ModTime: time.Now().UnixNano(),
- PathLocal: fileName,
- Uploaded: 0,
- State: fileidx.StateStarted,
- }
-
- switch srv.Index.Add(info) {
- case 0:
- // go on
- case -1:
- return httputil.Err412
- case 1:
- return httputil.Err500 // TODO: use correct status code
- default:
- srv.Index.Del(id)
- return httputil.Err500
- }
-
- fullPath := filepath.Join(srv.Conf.PathLocal, info.PathLocal)
- createFileErr := srv.Fs.CreateFile(fullPath)
- switch {
- case createFileErr == fsutil.ErrExists:
- srv.Index.Del(id)
- return httputil.Err412
- case createFileErr == fsutil.ErrUnknown:
- srv.Index.Del(id)
- return httputil.Err500
- default:
- srv.Index.SetState(id, fileidx.StateUploading)
- return &ByteRange{
- ShareId: id,
- Start: 0,
- Length: srv.Conf.MaxUpBytesPerSec,
- }
- }
-}
-
-func (srv *SrvShare) Upload(res http.ResponseWriter, req *http.Request) interface{} {
- shareId := req.FormValue(srv.Conf.KeyShareId)
- start, startErr := strconv.ParseInt(req.FormValue(srv.Conf.KeyStart), 10, 64)
- length, lengthErr := strconv.ParseInt(req.FormValue(srv.Conf.KeyLen), 10, 64)
- chunk, _, chunkErr := req.FormFile(srv.Conf.KeyChunk)
-
- if srv.Err.IsErr(startErr) ||
- srv.Err.IsErr(lengthErr) ||
- srv.Err.IsErr(chunkErr) {
- return httputil.Err400
- }
-
- return srv.upload(shareId, start, length, chunk)
-}
-
-func (srv *SrvShare) upload(shareId string, start int64, length int64, chunk io.Reader) interface{} {
- if !srv.IsValidShareId(shareId) {
- return httputil.Err400
- }
-
- fileInfo, found := srv.Index.Get(shareId)
- if !found {
- return httputil.Err404
- }
-
- if !srv.IsValidStart(start, fileInfo.Uploaded) || !srv.IsValidLength(length) {
- return httputil.Err400
- }
-
- fullPath := filepath.Join(srv.Conf.PathLocal, fileInfo.PathLocal)
- if !srv.Fs.CopyChunkN(fullPath, chunk, start, length) {
- return httputil.Err500
- }
-
- if srv.Index.IncrUploaded(shareId, length) == 0 {
- return httputil.Err404
- }
-
- return &ByteRange{
- ShareId: shareId,
- Start: start + length,
- Length: srv.Conf.MaxUpBytesPerSec,
- }
-}
-
-func (srv *SrvShare) FinishUpload(res http.ResponseWriter, req *http.Request) interface{} {
- shareId := req.FormValue(srv.Conf.KeyShareId)
- return srv.finishUpload(shareId)
-}
-
-func (srv *SrvShare) finishUpload(shareId string) interface{} {
- if !srv.Index.SetState(shareId, fileidx.StateDone) {
- return httputil.Err404
- }
-
- return &ShareInfo{
- ShareId: shareId,
- }
-}
-
-func genInfoId(content string, key []byte) string {
- encrypter := encrypt.HmacEncryptor{Key: key}
- return encrypter.Encrypt([]byte(content))
-}
diff --git a/server/apis/upload_test.go b/server/apis/upload_test.go
deleted file mode 100644
index 2338439..0000000
--- a/server/apis/upload_test.go
+++ /dev/null
@@ -1,368 +0,0 @@
-package apis
-
-import (
- "fmt"
- "io"
- "os"
- "path/filepath"
- "strings"
- "testing"
- "time"
-)
-
-import (
- "github.com/ihexxa/quickshare/server/libs/cfg"
- "github.com/ihexxa/quickshare/server/libs/encrypt"
- "github.com/ihexxa/quickshare/server/libs/errutil"
- "github.com/ihexxa/quickshare/server/libs/fileidx"
- "github.com/ihexxa/quickshare/server/libs/httputil"
- "github.com/ihexxa/quickshare/server/libs/httpworker"
- "github.com/ihexxa/quickshare/server/libs/limiter"
- "github.com/ihexxa/quickshare/server/libs/logutil"
- "github.com/ihexxa/quickshare/server/libs/walls"
-)
-
-const testCap = 3
-
-func initServiceForUploadTest(config *cfg.Config, indexMap map[string]*fileidx.FileInfo) *SrvShare {
- logger := logutil.NewSlog(os.Stdout, config.AppName)
- setLog := func(srv *SrvShare) {
- srv.Log = logger
- }
-
- setWorkerPool := func(srv *SrvShare) {
- workerPoolSize := config.WorkerPoolSize
- taskQueueSize := config.TaskQueueSize
- srv.WorkerPool = httpworker.NewWorkerPool(workerPoolSize, taskQueueSize, logger)
- }
-
- setWalls := func(srv *SrvShare) {
- encrypterMaker := encrypt.JwtEncrypterMaker
- ipLimiter := limiter.NewRateLimiter(config.LimiterCap, config.LimiterTtl, config.LimiterCyc, config.BucketCap, map[int16]int16{})
- opLimiter := limiter.NewRateLimiter(config.LimiterCap, config.LimiterTtl, config.LimiterCyc, config.BucketCap, map[int16]int16{})
- srv.Walls = walls.NewAccessWalls(config, ipLimiter, opLimiter, encrypterMaker)
- }
-
- setIndex := func(srv *SrvShare) {
- srv.Index = fileidx.NewMemFileIndexWithMap(len(indexMap)+testCap, indexMap)
- }
-
- setFs := func(srv *SrvShare) {
- srv.Fs = &stubFsUtil{}
- }
-
- setEncryptor := func(srv *SrvShare) {
- srv.Encryptor = &encrypt.HmacEncryptor{Key: config.SecretKeyByte}
- }
-
- errChecker := errutil.NewErrChecker(!config.Production, logger)
- setErr := func(srv *SrvShare) {
- srv.Err = errChecker
- }
-
- return InitSrvShare(config, setIndex, setWalls, setWorkerPool, setFs, setEncryptor, setLog, setErr)
-}
-
-func TestStartUpload(t *testing.T) {
- conf := cfg.NewConfig()
- conf.Production = false
-
- type Init struct {
- IndexMap map[string]*fileidx.FileInfo
- }
- type Input struct {
- FileName string
- }
- type Output struct {
- Response interface{}
- IndexMap map[string]*fileidx.FileInfo
- }
- type testCase struct {
- Desc string
- Init
- Input
- Output
- }
-
- testCases := []testCase{
- testCase{
- Desc: "invalid file name",
- Init: Init{
- IndexMap: map[string]*fileidx.FileInfo{},
- },
- Input: Input{
- FileName: "",
- },
- Output: Output{
- IndexMap: map[string]*fileidx.FileInfo{},
- Response: httputil.Err400,
- },
- },
- testCase{
- Desc: "succeed to start uploading",
- Init: Init{
- IndexMap: map[string]*fileidx.FileInfo{},
- },
- Input: Input{
- FileName: "filename",
- },
- Output: Output{
- IndexMap: map[string]*fileidx.FileInfo{
- DefaultId: &fileidx.FileInfo{
- Id: DefaultId,
- DownLimit: conf.DownLimit,
- ModTime: time.Now().UnixNano(),
- PathLocal: "filename",
- Uploaded: 0,
- State: fileidx.StateUploading,
- },
- },
- Response: &ByteRange{
- ShareId: DefaultId,
- Start: 0,
- Length: conf.MaxUpBytesPerSec,
- },
- },
- },
- }
-
- for _, testCase := range testCases {
- srv := initServiceForUploadTest(conf, testCase.Init.IndexMap)
-
- // verify CreateFile
- expectCreateFileName = filepath.Join(conf.PathLocal, testCase.FileName)
-
- response := srv.startUpload(testCase.FileName)
-
- // verify index
- if !sameMap(srv.Index.List(), testCase.Output.IndexMap) {
- t.Fatalf("startUpload: index not equal got: %v, %v, expect: %v", srv.Index.List(), response, testCase.Output.IndexMap)
- }
-
- // verify response
- switch expectRes := testCase.Output.Response.(type) {
- case *ByteRange:
- res := response.(*ByteRange)
- if res.ShareId != expectRes.ShareId ||
- res.Start != expectRes.Start ||
- res.Length != expectRes.Length {
- t.Fatalf(fmt.Sprintf("startUpload: res=%v expect=%v", res, expectRes))
- }
- case httputil.MsgRes:
- if response != expectRes {
- t.Fatalf(fmt.Sprintf("startUpload: response=%v expectRes=%v", response, expectRes))
- }
- default:
- t.Fatalf(fmt.Sprintf("startUpload: type not found: %T %T", testCase.Output.Response, httputil.Err400))
- }
- }
-}
-
-func TestUpload(t *testing.T) {
- conf := cfg.NewConfig()
- conf.Production = false
-
- type Init struct {
- IndexMap map[string]*fileidx.FileInfo
- }
- type Input struct {
- ShareId string
- Start int64
- Len int64
- Chunk io.Reader
- }
- type Output struct {
- IndexMap map[string]*fileidx.FileInfo
- Response interface{}
- }
- type testCase struct {
- Desc string
- Init
- Input
- Output
- }
-
- testCases := []testCase{
- testCase{
- Desc: "shareid does not exist",
- Init: Init{
- IndexMap: map[string]*fileidx.FileInfo{},
- },
- Input: Input{
- ShareId: DefaultId,
- Start: 0,
- Len: 1,
- Chunk: strings.NewReader(""),
- },
- Output: Output{
- IndexMap: map[string]*fileidx.FileInfo{},
- Response: httputil.Err404,
- },
- },
- testCase{
- Desc: "succeed",
- Init: Init{
- IndexMap: map[string]*fileidx.FileInfo{
- DefaultId: &fileidx.FileInfo{
- Id: DefaultId,
- DownLimit: conf.MaxShares,
- PathLocal: "path/filename",
- State: fileidx.StateUploading,
- Uploaded: 0,
- },
- },
- },
- Input: Input{
- ShareId: DefaultId,
- Start: 0,
- Len: 1,
- Chunk: strings.NewReader("a"),
- },
- Output: Output{
- IndexMap: map[string]*fileidx.FileInfo{
- DefaultId: &fileidx.FileInfo{
- Id: DefaultId,
- DownLimit: conf.MaxShares,
- PathLocal: "path/filename",
- State: fileidx.StateUploading,
- Uploaded: 1,
- },
- },
- Response: &ByteRange{
- ShareId: DefaultId,
- Start: 1,
- Length: conf.MaxUpBytesPerSec,
- },
- },
- },
- }
-
- for _, testCase := range testCases {
- srv := initServiceForUploadTest(conf, testCase.Init.IndexMap)
-
- response := srv.upload(
- testCase.Input.ShareId,
- testCase.Input.Start,
- testCase.Input.Len,
- testCase.Input.Chunk,
- )
-
- // TODO: not verified copyChunk
-
- // verify index
- if !sameMap(srv.Index.List(), testCase.Output.IndexMap) {
- t.Fatalf("upload: index not identical got: %v want: %v", srv.Index.List(), testCase.Output.IndexMap)
- }
- // verify response
- switch response.(type) {
- case *ByteRange:
- br := testCase.Output.Response.(*ByteRange)
- res := response.(*ByteRange)
- if res.ShareId != br.ShareId || res.Start != br.Start || res.Length != br.Length {
- t.Fatalf(fmt.Sprintf("upload: response=%v expectRes=%v", res, br))
- }
- default:
- if response != testCase.Output.Response {
- t.Fatalf(fmt.Sprintf("upload: response=%v expectRes=%v", response, testCase.Output.Response))
- }
- }
- }
-}
-
-func TestFinishUpload(t *testing.T) {
- conf := cfg.NewConfig()
- conf.Production = false
-
- type Init struct {
- IndexMap map[string]*fileidx.FileInfo
- }
- type Input struct {
- ShareId string
- Start int64
- Len int64
- Chunk io.Reader
- }
- type Output struct {
- IndexMap map[string]*fileidx.FileInfo
- Response interface{}
- }
- type testCase struct {
- Desc string
- Init
- Input
- Output
- }
-
- testCases := []testCase{
- testCase{
- Desc: "success",
- Init: Init{
- IndexMap: map[string]*fileidx.FileInfo{
- DefaultId: &fileidx.FileInfo{
- Id: DefaultId,
- DownLimit: conf.MaxShares,
- PathLocal: "path/filename",
- State: fileidx.StateUploading,
- Uploaded: 1,
- },
- },
- },
- Input: Input{
- ShareId: DefaultId,
- },
- Output: Output{
- IndexMap: map[string]*fileidx.FileInfo{
- DefaultId: &fileidx.FileInfo{
- Id: DefaultId,
- DownLimit: conf.MaxShares,
- PathLocal: "path/filename",
- State: fileidx.StateDone,
- Uploaded: 1,
- },
- },
- Response: &ShareInfo{
- ShareId: DefaultId,
- },
- },
- },
- testCase{
- Desc: "shareId exists",
- Init: Init{
- IndexMap: map[string]*fileidx.FileInfo{},
- },
- Input: Input{
- ShareId: DefaultId,
- },
- Output: Output{
- IndexMap: map[string]*fileidx.FileInfo{},
- Response: httputil.Err404,
- },
- },
- }
-
- for _, testCase := range testCases {
- srv := initServiceForUploadTest(conf, testCase.Init.IndexMap)
-
- response := srv.finishUpload(testCase.ShareId)
-
- if !sameMap(srv.Index.List(), testCase.Output.IndexMap) {
- t.Fatalf("finishUpload: index not identical got: %v, want: %v", srv.Index.List(), testCase.Output.IndexMap)
- }
-
- switch res := response.(type) {
- case httputil.MsgRes:
- expectRes := testCase.Output.Response.(httputil.MsgRes)
- if res != expectRes {
- t.Fatalf(fmt.Sprintf("finishUpload: response=%v expectRes=%v", res, expectRes))
- }
- case *ShareInfo:
- info, found := testCase.Output.IndexMap[res.ShareId]
- if !found || info.State != fileidx.StateDone {
- // TODO: should use isValidUrl or better to verify result
- t.Fatalf(fmt.Sprintf("finishUpload: share info is not correct: received: %v expect: %v", res.ShareId, testCase.ShareId))
- }
- default:
- t.Fatalf(fmt.Sprintf("finishUpload: type not found: %T %T", response, testCase.Output.Response))
- }
- }
-}
diff --git a/server/libs/cfg/cfg.go b/server/libs/cfg/cfg.go
deleted file mode 100644
index c1272de..0000000
--- a/server/libs/cfg/cfg.go
+++ /dev/null
@@ -1,251 +0,0 @@
-package cfg
-
-import (
- "encoding/json"
- "errors"
- "fmt"
- "io/ioutil"
- "net"
- "strconv"
- "strings"
-)
-
-type Config struct {
- AppName string
- AdminId string
- AdminPwd string
- SecretKey string
- SecretKeyByte []byte `json:",omitempty"`
- // server
- Production bool
- HostName string
- Port int
- // performance
- MaxUpBytesPerSec int64
- MaxDownBytesPerSec int64
- MaxRangeLength int64
- Timeout int // millisecond
- ReadTimeout int
- WriteTimeout int
- IdleTimeout int
- WorkerPoolSize int
- TaskQueueSize int
- QueueSize int
- ParseFormBufSize int64
- MaxHeaderBytes int
- DownLimit int
- MaxShares int
- LocalFileLimit int
- // Cookie
- CookieDomain string
- CookieHttpOnly bool
- CookieMaxAge int
- CookiePath string
- CookieSecure bool
- // keys
- KeyAdminId string
- KeyAdminPwd string
- KeyToken string
- KeyFileName string
- KeyFileSize string
- KeyShareId string
- KeyStart string
- KeyLen string
- KeyChunk string
- KeyAct string
- KeyExpires string
- KeyDownLimit string
- ActStartUpload string
- ActUpload string
- ActFinishUpload string
- ActLogin string
- ActLogout string
- ActShadowId string
- ActPublishId string
- ActSetDownLimit string
- ActAddLocalFiles string
- // resource id
- AllUsers string
- // opIds
- OpIdIpVisit int16
- OpIdUpload int16
- OpIdDownload int16
- OpIdLogin int16
- OpIdGetFInfo int16
- OpIdDelFInfo int16
- OpIdOpFInfo int16
- // local
- PathLocal string
- PathLogin string
- PathDownloadLogin string
- PathDownload string
- PathUpload string
- PathStartUpload string
- PathFinishUpload string
- PathFileInfo string
- PathClient string
- // rate Limiter
- LimiterCap int64
- LimiterTtl int32
- LimiterCyc int32
- BucketCap int16
- SpecialCapsStr map[string]int16
- SpecialCaps map[int16]int16
-}
-
-func NewConfig() *Config {
- config := &Config{
- // secrets
- AppName: "qs",
- AdminId: "admin",
- AdminPwd: "qs",
- SecretKey: "qs",
- SecretKeyByte: []byte("qs"),
- // server
- Production: true,
- HostName: "localhost",
- Port: 8888,
- // performance
- MaxUpBytesPerSec: 500 * 1000,
- MaxDownBytesPerSec: 500 * 1000,
- MaxRangeLength: 10 * 1024 * 1024,
- Timeout: 500, // millisecond,
- ReadTimeout: 500,
- WriteTimeout: 43200000,
- IdleTimeout: 10000,
- WorkerPoolSize: 2,
- TaskQueueSize: 2,
- QueueSize: 2,
- ParseFormBufSize: 600,
- MaxHeaderBytes: 1 << 15, // 32KB
- DownLimit: -1,
- MaxShares: 1 << 31,
- LocalFileLimit: -1,
- // Cookie
- CookieDomain: "",
- CookieHttpOnly: false,
- CookieMaxAge: 3600 * 24 * 30, // one week,
- CookiePath: "/",
- CookieSecure: false,
- // keys
- KeyAdminId: "adminid",
- KeyAdminPwd: "adminpwd",
- KeyToken: "token",
- KeyFileName: "fname",
- KeyFileSize: "size",
- KeyShareId: "shareid",
- KeyStart: "start",
- KeyLen: "len",
- KeyChunk: "chunk",
- KeyAct: "act",
- KeyExpires: "expires",
- KeyDownLimit: "downlimit",
- ActStartUpload: "startupload",
- ActUpload: "upload",
- ActFinishUpload: "finishupload",
- ActLogin: "login",
- ActLogout: "logout",
- ActShadowId: "shadowid",
- ActPublishId: "publishid",
- ActSetDownLimit: "setdownlimit",
- ActAddLocalFiles: "addlocalfiles",
- AllUsers: "allusers",
- // opIds
- OpIdIpVisit: 0,
- OpIdUpload: 1,
- OpIdDownload: 2,
- OpIdLogin: 3,
- OpIdGetFInfo: 4,
- OpIdDelFInfo: 5,
- OpIdOpFInfo: 6,
- // local
- PathLocal: "files",
- PathLogin: "/login",
- PathDownloadLogin: "/download-login",
- PathDownload: "/download",
- PathUpload: "/upload",
- PathStartUpload: "/startupload",
- PathFinishUpload: "/finishupload",
- PathFileInfo: "/fileinfo",
- PathClient: "/",
- // rate Limiter
- LimiterCap: 256, // how many op supported for each user
- LimiterTtl: 3600, // second
- LimiterCyc: 1, // second
- BucketCap: 3, // how many op can do per LimiterCyc sec
- SpecialCaps: map[int16]int16{
- 0: 5, // ip
- 1: 1, // upload
- 2: 1, // download
- 3: 1, // login
- },
- }
-
- return config
-}
-
-func NewConfigFrom(path string) *Config {
- configBytes, readErr := ioutil.ReadFile(path)
- if readErr != nil {
- panic(fmt.Sprintf("config file not found: %s", path))
- }
-
- config := &Config{}
- marshalErr := json.Unmarshal(configBytes, config)
-
- // TODO: look for a better solution
- config.SpecialCaps = make(map[int16]int16)
- for strKey, value := range config.SpecialCapsStr {
- key, parseKeyErr := strconv.ParseInt(strKey, 10, 16)
- if parseKeyErr != nil {
- panic("fail to parse SpecialCapsStr, its type should be map[int16]int16")
- }
- config.SpecialCaps[int16(key)] = value
- }
-
- if marshalErr != nil {
- panic("config file format is incorrect")
- }
-
- config.SecretKeyByte = []byte(config.SecretKey)
- if config.HostName == "" {
- hostName, err := GetLocalAddr()
- if err != nil {
- panic(err)
- }
- config.HostName = hostName.String()
- }
-
- return config
-}
-
-func GetLocalAddr() (net.IP, error) {
- fmt.Println(`config.HostName is empty(""), choose one IP for listening automatically.`)
- infs, err := net.Interfaces()
- if err != nil {
- panic("fail to get net interfaces")
- }
-
- for _, inf := range infs {
- if inf.Flags&4 != 4 && !strings.Contains(inf.Name, "docker") {
- addrs, err := inf.Addrs()
- if err != nil {
- panic("fail to get addrs of interface")
- }
- for _, addr := range addrs {
- switch v := addr.(type) {
- case *net.IPAddr:
- if !strings.Contains(v.IP.String(), ":") {
- return v.IP, nil
- }
- case *net.IPNet:
- if !strings.Contains(v.IP.String(), ":") {
- return v.IP, nil
- }
- }
- }
- }
- }
-
- return nil, errors.New("no addr found")
-}
diff --git a/server/libs/encrypt/encrypter_hmac.go b/server/libs/encrypt/encrypter_hmac.go
deleted file mode 100644
index fc2687d..0000000
--- a/server/libs/encrypt/encrypter_hmac.go
+++ /dev/null
@@ -1,17 +0,0 @@
-package encrypt
-
-import (
- "crypto/hmac"
- "crypto/sha256"
- "encoding/hex"
-)
-
-type HmacEncryptor struct {
- Key []byte
-}
-
-func (encryptor *HmacEncryptor) Encrypt(content []byte) string {
- mac := hmac.New(sha256.New, encryptor.Key)
- mac.Write(content)
- return hex.EncodeToString(mac.Sum(nil))
-}
diff --git a/server/libs/encrypt/encryptor.go b/server/libs/encrypt/encryptor.go
deleted file mode 100644
index e7438c9..0000000
--- a/server/libs/encrypt/encryptor.go
+++ /dev/null
@@ -1,5 +0,0 @@
-package encrypt
-
-type Encryptor interface {
- Encrypt(content []byte) string
-}
diff --git a/server/libs/encrypt/jwt.go b/server/libs/encrypt/jwt.go
deleted file mode 100644
index e54b5cb..0000000
--- a/server/libs/encrypt/jwt.go
+++ /dev/null
@@ -1,53 +0,0 @@
-package encrypt
-
-import (
- "github.com/robbert229/jwt"
-)
-
-func JwtEncrypterMaker(secret string) TokenEncrypter {
- return &JwtEncrypter{
- alg: jwt.HmacSha256(secret),
- claims: jwt.NewClaim(),
- }
-}
-
-type JwtEncrypter struct {
- alg jwt.Algorithm
- claims *jwt.Claims
-}
-
-func (encrypter *JwtEncrypter) Add(key string, value string) bool {
- encrypter.claims.Set(key, value)
- return true
-}
-
-func (encrypter *JwtEncrypter) FromStr(token string) bool {
- claims, err := encrypter.alg.Decode(token)
- // TODO: should return error or error info will lost
- if err != nil {
- return false
- }
-
- encrypter.claims = claims
- return true
-}
-
-func (encrypter *JwtEncrypter) Get(key string) (string, bool) {
- iValue, err := encrypter.claims.Get(key)
- // TODO: should return error or error info will lost
- if err != nil {
- return "", false
- }
-
- return iValue.(string), true
-}
-
-func (encrypter *JwtEncrypter) ToStr() (string, bool) {
- token, err := encrypter.alg.Encode(encrypter.claims)
-
- // TODO: should return error or error info will lost
- if err != nil {
- return "", false
- }
- return token, true
-}
diff --git a/server/libs/encrypt/token_encrypter.go b/server/libs/encrypt/token_encrypter.go
deleted file mode 100644
index d400163..0000000
--- a/server/libs/encrypt/token_encrypter.go
+++ /dev/null
@@ -1,11 +0,0 @@
-package encrypt
-
-type EncrypterMaker func(string) TokenEncrypter
-
-// TODO: name should be Encrypter?
-type TokenEncrypter interface {
- Add(string, string) bool
- FromStr(string) bool
- Get(string) (string, bool)
- ToStr() (string, bool)
-}
diff --git a/server/libs/errutil/ettutil.go b/server/libs/errutil/ettutil.go
deleted file mode 100644
index 8b53bd0..0000000
--- a/server/libs/errutil/ettutil.go
+++ /dev/null
@@ -1,59 +0,0 @@
-package errutil
-
-import (
- "os"
- "runtime/debug"
-)
-
-import (
- "github.com/ihexxa/quickshare/server/libs/logutil"
-)
-
-type ErrUtil interface {
- IsErr(err error) bool
- IsFatalErr(err error) bool
- RecoverPanic()
-}
-
-func NewErrChecker(logStack bool, logger logutil.LogUtil) ErrUtil {
- return &ErrChecker{logStack: logStack, log: logger}
-}
-
-type ErrChecker struct {
- log logutil.LogUtil
- logStack bool
-}
-
-// IsErr checks if error occurs
-func (e *ErrChecker) IsErr(err error) bool {
- if err != nil {
- e.log.Printf("Error:%q\n", err)
- if e.logStack {
- e.log.Println(debug.Stack())
- }
- return true
- }
- return false
-}
-
-// IsFatalPanic should be used with defer
-func (e *ErrChecker) IsFatalErr(fe error) bool {
- if fe != nil {
- e.log.Printf("Panic:%q", fe)
- if e.logStack {
- e.log.Println(debug.Stack())
- }
- os.Exit(1)
- }
- return false
-}
-
-// RecoverPanic catchs the panic and logs panic information
-func (e *ErrChecker) RecoverPanic() {
- if r := recover(); r != nil {
- e.log.Printf("Recovered:%v", r)
- if e.logStack {
- e.log.Println(debug.Stack())
- }
- }
-}
diff --git a/server/libs/fileidx/file_idx.go b/server/libs/fileidx/file_idx.go
deleted file mode 100644
index 3b96f34..0000000
--- a/server/libs/fileidx/file_idx.go
+++ /dev/null
@@ -1,177 +0,0 @@
-package fileidx
-
-import (
- "sync"
-)
-
-const (
- // StateStarted = after startUpload before upload
- StateStarted = "started"
- // StateUploading =after upload before finishUpload
- StateUploading = "uploading"
- // StateDone = after finishedUpload
- StateDone = "done"
-)
-
-type FileInfo struct {
- Id string
- DownLimit int
- ModTime int64
- PathLocal string
- State string
- Uploaded int64
-}
-
-type FileIndex interface {
- Add(fileInfo *FileInfo) int
- Del(id string)
- SetId(id string, newId string) bool
- SetDownLimit(id string, downLimit int) bool
- DecrDownLimit(id string) (int, bool)
- SetState(id string, state string) bool
- IncrUploaded(id string, uploaded int64) int64
- Get(id string) (*FileInfo, bool)
- List() map[string]*FileInfo
-}
-
-func NewMemFileIndex(cap int) *MemFileIndex {
- return &MemFileIndex{
- cap: cap,
- infos: make(map[string]*FileInfo, 0),
- }
-}
-
-func NewMemFileIndexWithMap(cap int, infos map[string]*FileInfo) *MemFileIndex {
- return &MemFileIndex{
- cap: cap,
- infos: infos,
- }
-}
-
-type MemFileIndex struct {
- cap int
- infos map[string]*FileInfo
- mux sync.RWMutex
-}
-
-func (idx *MemFileIndex) Add(fileInfo *FileInfo) int {
- idx.mux.Lock()
- defer idx.mux.Unlock()
-
- if len(idx.infos) >= idx.cap {
- return 1
- }
-
- if _, found := idx.infos[fileInfo.Id]; found {
- return -1
- }
-
- idx.infos[fileInfo.Id] = fileInfo
- return 0
-}
-
-func (idx *MemFileIndex) Del(id string) {
- idx.mux.Lock()
- defer idx.mux.Unlock()
-
- delete(idx.infos, id)
-}
-
-func (idx *MemFileIndex) SetId(id string, newId string) bool {
- if id == newId {
- return true
- }
-
- idx.mux.Lock()
- defer idx.mux.Unlock()
-
- info, found := idx.infos[id]
- if !found {
- return false
- }
-
- if _, foundNewId := idx.infos[newId]; foundNewId {
- return false
- }
-
- idx.infos[newId] = info
- idx.infos[newId].Id = newId
- delete(idx.infos, id)
- return true
-}
-
-func (idx *MemFileIndex) SetDownLimit(id string, downLimit int) bool {
- idx.mux.Lock()
- defer idx.mux.Unlock()
-
- info, found := idx.infos[id]
- if !found {
- return false
- }
-
- info.DownLimit = downLimit
- return true
-}
-
-func (idx *MemFileIndex) DecrDownLimit(id string) (int, bool) {
- idx.mux.Lock()
- defer idx.mux.Unlock()
-
- info, found := idx.infos[id]
- if !found || info.State != StateDone {
- return 0, false
- }
-
- if info.DownLimit == 0 {
- return 1, false
- }
-
- if info.DownLimit > 0 {
- // info.DownLimit means unlimited
- info.DownLimit = info.DownLimit - 1
- }
- return 1, true
-}
-
-func (idx *MemFileIndex) SetState(id string, state string) bool {
- idx.mux.Lock()
- defer idx.mux.Unlock()
-
- info, found := idx.infos[id]
- if !found {
- return false
- }
-
- info.State = state
- return true
-}
-
-func (idx *MemFileIndex) IncrUploaded(id string, uploaded int64) int64 {
- idx.mux.Lock()
- defer idx.mux.Unlock()
-
- info, found := idx.infos[id]
- if !found {
- return 0
- }
-
- info.Uploaded = info.Uploaded + uploaded
- return info.Uploaded
-}
-
-func (idx *MemFileIndex) Get(id string) (*FileInfo, bool) {
- idx.mux.RLock()
- defer idx.mux.RUnlock()
-
- infos, found := idx.infos[id]
- return infos, found
-}
-
-func (idx *MemFileIndex) List() map[string]*FileInfo {
- idx.mux.RLock()
- defer idx.mux.RUnlock()
-
- return idx.infos
-}
-
-// TODO: add unit tests
diff --git a/server/libs/fsutil/fsutil.go b/server/libs/fsutil/fsutil.go
deleted file mode 100644
index 6547cd1..0000000
--- a/server/libs/fsutil/fsutil.go
+++ /dev/null
@@ -1,118 +0,0 @@
-package fsutil
-
-import (
- "errors"
- "io"
- "os"
-)
-
-import (
- "github.com/ihexxa/quickshare/server/libs/errutil"
- "github.com/ihexxa/quickshare/server/libs/fileidx"
- "github.com/ihexxa/quickshare/server/libs/qtube"
-)
-
-type FsUtil interface {
- CreateFile(fullPath string) error
- CopyChunkN(fullPath string, chunk io.Reader, start int64, length int64) bool
- DelFile(fullPath string) bool
- Open(fullPath string) (qtube.ReadSeekCloser, error)
- MkdirAll(path string, mode os.FileMode) bool
- Readdir(dirName string, n int) ([]*fileidx.FileInfo, error)
-}
-
-func NewSimpleFs(errUtil errutil.ErrUtil) FsUtil {
- return &SimpleFs{
- Err: errUtil,
- }
-}
-
-type SimpleFs struct {
- Err errutil.ErrUtil
-}
-
-var (
- ErrExists = errors.New("file exists")
- ErrUnknown = errors.New("unknown error")
-)
-
-func (sfs *SimpleFs) CreateFile(fullPath string) error {
- flag := os.O_CREATE | os.O_EXCL | os.O_RDONLY
- perm := os.FileMode(0644)
- newFile, err := os.OpenFile(fullPath, flag, perm)
- defer newFile.Close()
-
- if err == nil {
- return nil
- } else if os.IsExist(err) {
- return ErrExists
- } else {
- return ErrUnknown
- }
-}
-
-func (sfs *SimpleFs) CopyChunkN(fullPath string, chunk io.Reader, start int64, length int64) bool {
- flag := os.O_WRONLY
- perm := os.FileMode(0644)
- file, openErr := os.OpenFile(fullPath, flag, perm)
-
- defer file.Close()
- if sfs.Err.IsErr(openErr) {
- return false
- }
-
- if _, err := file.Seek(start, io.SeekStart); sfs.Err.IsErr(err) {
- return false
- }
-
- if _, err := io.CopyN(file, chunk, length); sfs.Err.IsErr(err) && err != io.EOF {
- return false
- }
-
- return true
-}
-
-func (sfs *SimpleFs) DelFile(fullPath string) bool {
- return !sfs.Err.IsErr(os.Remove(fullPath))
-}
-
-func (sfs *SimpleFs) MkdirAll(path string, mode os.FileMode) bool {
- err := os.MkdirAll(path, mode)
- return !sfs.Err.IsErr(err)
-}
-
-// TODO: not support read from last seek position
-func (sfs *SimpleFs) Readdir(dirName string, n int) ([]*fileidx.FileInfo, error) {
- dir, openErr := os.Open(dirName)
- defer dir.Close()
-
- if sfs.Err.IsErr(openErr) {
- return []*fileidx.FileInfo{}, openErr
- }
-
- osFileInfos, readErr := dir.Readdir(n)
- if sfs.Err.IsErr(readErr) && readErr != io.EOF {
- return []*fileidx.FileInfo{}, readErr
- }
-
- fileInfos := make([]*fileidx.FileInfo, 0)
- for _, osFileInfo := range osFileInfos {
- if osFileInfo.Mode().IsRegular() {
- fileInfos = append(
- fileInfos,
- &fileidx.FileInfo{
- ModTime: osFileInfo.ModTime().UnixNano(),
- PathLocal: osFileInfo.Name(),
- Uploaded: osFileInfo.Size(),
- },
- )
- }
- }
-
- return fileInfos, readErr
-}
-
-// the associated file descriptor has mode O_RDONLY as using os.Open
-func (sfs *SimpleFs) Open(fullPath string) (qtube.ReadSeekCloser, error) {
- return os.Open(fullPath)
-}
diff --git a/server/libs/httputil/httputil.go b/server/libs/httputil/httputil.go
deleted file mode 100644
index 1dda6e3..0000000
--- a/server/libs/httputil/httputil.go
+++ /dev/null
@@ -1,84 +0,0 @@
-package httputil
-
-import (
- "encoding/json"
- "net/http"
- "time"
-)
-
-import (
- "github.com/ihexxa/quickshare/server/libs/errutil"
-)
-
-type MsgRes struct {
- Code int
- Msg string
-}
-
-var (
- Err400 = MsgRes{Code: http.StatusBadRequest, Msg: "Bad Request"}
- Err401 = MsgRes{Code: http.StatusUnauthorized, Msg: "Unauthorized"}
- Err404 = MsgRes{Code: http.StatusNotFound, Msg: "Not Found"}
- Err412 = MsgRes{Code: http.StatusPreconditionFailed, Msg: "Precondition Failed"}
- Err429 = MsgRes{Code: http.StatusTooManyRequests, Msg: "Too Many Requests"}
- Err500 = MsgRes{Code: http.StatusInternalServerError, Msg: "Internal Server Error"}
- Err503 = MsgRes{Code: http.StatusServiceUnavailable, Msg: "Service Unavailable"}
- Err504 = MsgRes{Code: http.StatusGatewayTimeout, Msg: "Gateway Timeout"}
- Ok200 = MsgRes{Code: http.StatusOK, Msg: "OK"}
-)
-
-type HttpUtil interface {
- GetCookie(cookies []*http.Cookie, key string) string
- SetCookie(res http.ResponseWriter, key string, val string)
- Fill(msg interface{}, res http.ResponseWriter) int
-}
-
-type QHttpUtil struct {
- CookieDomain string
- CookieHttpOnly bool
- CookieMaxAge int
- CookiePath string
- CookieSecure bool
- Err errutil.ErrUtil
-}
-
-func (q *QHttpUtil) GetCookie(cookies []*http.Cookie, key string) string {
- for _, cookie := range cookies {
- if cookie.Name == key {
- return cookie.Value
- }
- }
- return ""
-}
-
-func (q *QHttpUtil) SetCookie(res http.ResponseWriter, key string, val string) {
- cookie := http.Cookie{
- Name: key,
- Value: val,
- Domain: q.CookieDomain,
- Expires: time.Now().Add(time.Duration(q.CookieMaxAge) * time.Second),
- HttpOnly: q.CookieHttpOnly,
- MaxAge: q.CookieMaxAge,
- Secure: q.CookieSecure,
- Path: q.CookiePath,
- }
-
- res.Header().Set("Set-Cookie", cookie.String())
-}
-
-func (q *QHttpUtil) Fill(msg interface{}, res http.ResponseWriter) int {
- if msg == nil {
- return 0
- }
-
- msgBytes, marsErr := json.Marshal(msg)
- if q.Err.IsErr(marsErr) {
- return 0
- }
-
- wrote, writeErr := res.Write(msgBytes)
- if q.Err.IsErr(writeErr) {
- return 0
- }
- return wrote
-}
diff --git a/server/libs/httpworker/worker.go b/server/libs/httpworker/worker.go
deleted file mode 100644
index b578938..0000000
--- a/server/libs/httpworker/worker.go
+++ /dev/null
@@ -1,130 +0,0 @@
-package httpworker
-
-import (
- "errors"
- "net/http"
- "runtime/debug"
- "time"
-)
-
-import (
- "github.com/ihexxa/quickshare/server/libs/logutil"
-)
-
-var (
- ErrWorkerNotFound = errors.New("worker not found")
- ErrTimeout = errors.New("timeout")
-)
-
-type DoFunc func(http.ResponseWriter, *http.Request)
-
-type Task struct {
- Ack chan error
- Do DoFunc
- Res http.ResponseWriter
- Req *http.Request
-}
-
-type Workers interface {
- Put(*Task) bool
- IsInTime(ack chan error, msec time.Duration) error
-}
-
-type WorkerPool struct {
- queue chan *Task
- size int
- workers []*Worker
- log logutil.LogUtil // TODO: should not pass log here
-}
-
-func NewWorkerPool(poolSize int, queueSize int, log logutil.LogUtil) Workers {
- queue := make(chan *Task, queueSize)
- workers := make([]*Worker, 0, poolSize)
-
- for i := 0; i < poolSize; i++ {
- worker := &Worker{
- Id: uint64(i),
- queue: queue,
- log: log,
- }
-
- go worker.Start()
- workers = append(workers, worker)
- }
-
- return &WorkerPool{
- queue: queue,
- size: poolSize,
- workers: workers,
- log: log,
- }
-}
-
-func (pool *WorkerPool) Put(task *Task) bool {
- if len(pool.queue) >= pool.size {
- return false
- }
-
- pool.queue <- task
- return true
-}
-
-func (pool *WorkerPool) IsInTime(ack chan error, msec time.Duration) error {
- start := time.Now().UnixNano()
- timeout := make(chan error)
-
- go func() {
- time.Sleep(msec)
- timeout <- ErrTimeout
- }()
-
- select {
- case err := <-ack:
- if err == nil {
- pool.log.Printf(
- "finish cost: %d usec",
- (time.Now().UnixNano()-start)/1000,
- )
- } else {
- pool.log.Printf(
- "finish with error cost: %d usec",
- (time.Now().UnixNano()-start)/1000,
- )
- }
- return err
- case errTimeout := <-timeout:
- pool.log.Printf("timeout cost: %d usec", (time.Now().UnixNano()-start)/1000)
- return errTimeout
- }
-}
-
-type Worker struct {
- Id uint64
- queue chan *Task
- log logutil.LogUtil
-}
-
-func (worker *Worker) RecoverPanic() {
- if r := recover(); r != nil {
- worker.log.Printf("Recovered:%v stack: %v", r, debug.Stack())
- // restart worker and IsInTime will return timeout error for last task
- worker.Start()
- }
-}
-
-func (worker *Worker) Start() {
- defer worker.RecoverPanic()
-
- for {
- task := <-worker.queue
- if task.Do != nil {
- task.Do(task.Res, task.Req)
- task.Ack <- nil
- } else {
- task.Ack <- ErrWorkerNotFound
- }
- }
-}
-
-// ServiceFunc lets you return struct directly
-type ServiceFunc func(http.ResponseWriter, *http.Request) interface{}
diff --git a/server/libs/limiter/limiter.go b/server/libs/limiter/limiter.go
deleted file mode 100644
index 307037d..0000000
--- a/server/libs/limiter/limiter.go
+++ /dev/null
@@ -1,5 +0,0 @@
-package limiter
-
-type Limiter interface {
- Access(string, int16) bool
-}
diff --git a/server/libs/limiter/rate_limiter.go b/server/libs/limiter/rate_limiter.go
deleted file mode 100644
index 7bccf1a..0000000
--- a/server/libs/limiter/rate_limiter.go
+++ /dev/null
@@ -1,220 +0,0 @@
-package limiter
-
-import (
- "sync"
- "time"
-)
-
-func now() int32 {
- return int32(time.Now().Unix())
-}
-
-func afterCyc(cyc int32) int32 {
- return int32(time.Now().Unix()) + cyc
-}
-
-func afterTtl(ttl int32) int32 {
- return int32(time.Now().Unix()) + ttl
-}
-
-type Bucket struct {
- Refresh int32
- Tokens int16
-}
-
-func NewBucket(cyc int32, cap int16) *Bucket {
- return &Bucket{
- Refresh: afterCyc(cyc),
- Tokens: cap,
- }
-}
-
-type Item struct {
- Expired int32
- Buckets map[int16]*Bucket
-}
-
-func NewItem(ttl int32) *Item {
- return &Item{
- Expired: afterTtl(ttl),
- Buckets: make(map[int16]*Bucket),
- }
-}
-
-type RateLimiter struct {
- items map[string]*Item
- bucketCap int16
- customCaps map[int16]int16
- cap int64
- cyc int32 // how much time, item autoclean will be executed, bucket will be refreshed
- ttl int32 // how much time, item will be expired(but not cleaned)
- mux sync.RWMutex
- snapshot map[string]map[int16]*Bucket
-}
-
-func NewRateLimiter(cap int64, ttl int32, cyc int32, bucketCap int16, customCaps map[int16]int16) Limiter {
- if cap < 1 || ttl < 1 || cyc < 1 || bucketCap < 1 {
- panic("cap | bucketCap | ttl | cycle cant be less than 1")
- }
-
- limiter := &RateLimiter{
- items: make(map[string]*Item, cap),
- bucketCap: bucketCap,
- customCaps: customCaps,
- cap: cap,
- ttl: ttl,
- cyc: cyc,
- }
-
- go limiter.autoClean()
-
- return limiter
-}
-
-func (limiter *RateLimiter) getBucketCap(opId int16) int16 {
- bucketCap, existed := limiter.customCaps[opId]
- if !existed {
- return limiter.bucketCap
- }
- return bucketCap
-}
-
-func (limiter *RateLimiter) Access(itemId string, opId int16) bool {
- limiter.mux.Lock()
- defer limiter.mux.Unlock()
-
- item, itemExisted := limiter.items[itemId]
- if !itemExisted {
- if int64(len(limiter.items)) >= limiter.cap {
- return false
- }
-
- limiter.items[itemId] = NewItem(limiter.ttl)
- limiter.items[itemId].Buckets[opId] = NewBucket(limiter.cyc, limiter.getBucketCap(opId)-1)
- return true
- }
-
- bucket, bucketExisted := item.Buckets[opId]
- if !bucketExisted {
- item.Buckets[opId] = NewBucket(limiter.cyc, limiter.getBucketCap(opId)-1)
- return true
- }
-
- if bucket.Refresh > now() {
- if bucket.Tokens > 0 {
- bucket.Tokens--
- return true
- }
- return false
- }
-
- bucket.Refresh = afterCyc(limiter.cyc)
- bucket.Tokens = limiter.getBucketCap(opId) - 1
- return true
-}
-
-func (limiter *RateLimiter) GetCap() int64 {
- return limiter.cap
-}
-
-func (limiter *RateLimiter) GetSize() int64 {
- limiter.mux.RLock()
- defer limiter.mux.RUnlock()
- return int64(len(limiter.items))
-}
-
-func (limiter *RateLimiter) ExpandCap(cap int64) bool {
- limiter.mux.RLock()
- defer limiter.mux.RUnlock()
-
- if cap <= int64(len(limiter.items)) {
- return false
- }
-
- limiter.cap = cap
- return true
-}
-
-func (limiter *RateLimiter) GetTTL() int32 {
- return limiter.ttl
-}
-
-func (limiter *RateLimiter) UpdateTTL(ttl int32) bool {
- if ttl < 1 {
- return false
- }
-
- limiter.ttl = ttl
- return true
-}
-
-func (limiter *RateLimiter) GetCyc() int32 {
- return limiter.cyc
-}
-
-func (limiter *RateLimiter) UpdateCyc(cyc int32) bool {
- if limiter.cyc < 1 {
- return false
- }
-
- limiter.cyc = cyc
- return true
-}
-
-func (limiter *RateLimiter) Snapshot() map[string]map[int16]*Bucket {
- return limiter.snapshot
-}
-
-func (limiter *RateLimiter) autoClean() {
- for {
- if limiter.cyc == 0 {
- break
- }
- time.Sleep(time.Duration(int64(limiter.cyc) * 1000000000))
- limiter.clean()
- }
-}
-
-// clean may add affect other operations, do frequently?
-func (limiter *RateLimiter) clean() {
- limiter.snapshot = make(map[string]map[int16]*Bucket)
- now := now()
-
- limiter.mux.RLock()
- defer limiter.mux.RUnlock()
- for key, item := range limiter.items {
- if item.Expired <= now {
- delete(limiter.items, key)
- } else {
- limiter.snapshot[key] = item.Buckets
- }
- }
-}
-
-// Only for test
-func (limiter *RateLimiter) exist(id string) bool {
- limiter.mux.RLock()
- defer limiter.mux.RUnlock()
-
- _, existed := limiter.items[id]
- return existed
-}
-
-// Only for test
-func (limiter *RateLimiter) truncate() {
- limiter.mux.RLock()
- defer limiter.mux.RUnlock()
-
- for key, _ := range limiter.items {
- delete(limiter.items, key)
- }
-}
-
-// Only for test
-func (limiter *RateLimiter) get(id string) (*Item, bool) {
- limiter.mux.RLock()
- defer limiter.mux.RUnlock()
-
- item, existed := limiter.items[id]
- return item, existed
-}
diff --git a/server/libs/limiter/rate_limiter_test.go b/server/libs/limiter/rate_limiter_test.go
deleted file mode 100644
index 3f90dcf..0000000
--- a/server/libs/limiter/rate_limiter_test.go
+++ /dev/null
@@ -1,161 +0,0 @@
-package limiter
-
-import (
- "fmt"
- "math/rand"
- "testing"
- "time"
-)
-
-var rnd = rand.New(rand.NewSource(time.Now().UnixNano()))
-
-const rndCap = 10000
-const addCap = 1
-
-// how to set time
-// extend: wait can be greater than ttl/2
-// cyc is smaller than ttl and wait, then it can be clean in time
-const cap = 40
-const ttl = 3
-const cyc = 1
-const bucketCap = 2
-const id1 = "id1"
-const id2 = "id2"
-const op1 int16 = 0
-const op2 int16 = 1
-
-var customCaps = map[int16]int16{
- op2: 1000,
-}
-
-const wait = 1
-
-var limiter = NewRateLimiter(cap, ttl, cyc, bucketCap, customCaps).(*RateLimiter)
-
-func printItem(id string) {
- item, existed := limiter.get(id1)
- if existed {
- fmt.Println("expired, now, existed", item.Expired, now(), existed)
- for id, bucket := range item.Buckets {
- fmt.Println("\tid, bucket", id, bucket)
- }
- } else {
- fmt.Println("not existed")
- }
-}
-
-var idSeed = 0
-
-func randId() string {
- idSeed++
- return fmt.Sprintf("%d", idSeed)
-}
-
-func TestAccess(t *testing.T) {
- func(t *testing.T) {
- canAccess := limiter.Access(id1, op1)
- if !canAccess {
- t.Fatal("access: fail")
- }
-
- for i := 0; i < bucketCap; i++ {
- canAccess = limiter.Access(id1, op1)
- }
-
- if canAccess {
- t.Fatal("access: fail to deny access")
- }
-
- time.Sleep(time.Duration(limiter.GetCyc()) * time.Second)
-
- canAccess = limiter.Access(id1, op1)
- if !canAccess {
- t.Fatal("access: fail to refresh tokens")
- }
- }(t)
-}
-
-func TestCap(t *testing.T) {
- originalCap := limiter.GetCap()
- fmt.Printf("cap:info: %d\n", originalCap)
-
- ok := limiter.ExpandCap(originalCap + addCap)
-
- if !ok || limiter.GetCap() != originalCap+addCap {
- t.Fatal("cap: fail to expand")
- }
-
- ok = limiter.ExpandCap(limiter.GetSize() - addCap)
- if ok {
- t.Fatal("cap: shrink cap")
- }
-
- ids := []string{}
- for limiter.GetSize() < limiter.GetCap() {
- id := randId()
- ids = append(ids, id)
-
- ok := limiter.Access(id, 0)
- if !ok {
- t.Fatal("cap: not full")
- }
- }
-
- if limiter.GetSize() != limiter.GetCap() {
- t.Fatal("cap: incorrect size")
- }
-
- if limiter.Access(randId(), 0) {
- t.Fatal("cap: more than cap")
- }
-
- limiter.truncate()
-}
-
-func TestTtl(t *testing.T) {
- var addTtl int32 = 1
- originalTTL := limiter.GetTTL()
- fmt.Printf("ttl:info: %d\n", originalTTL)
-
- limiter.UpdateTTL(originalTTL + addTtl)
- if limiter.GetTTL() != originalTTL+addTtl {
- t.Fatal("ttl: update fail")
- }
-}
-
-func cycTest(t *testing.T) {
- var addCyc int32 = 1
- originalCyc := limiter.GetCyc()
- fmt.Printf("cyc:info: %d\n", originalCyc)
-
- limiter.UpdateCyc(originalCyc + addCyc)
- if limiter.GetCyc() != originalCyc+addCyc {
- t.Fatal("cyc: update fail")
- }
-}
-
-func autoCleanTest(t *testing.T) {
- ids := []string{
- randId(),
- randId(),
- }
-
- for _, id := range ids {
- ok := limiter.Access(id, 0)
- if ok {
- t.Fatal("autoClean: warning: add fail")
- }
- }
-
- time.Sleep(time.Duration(limiter.GetTTL()+wait) * time.Second)
-
- for _, id := range ids {
- _, exist := limiter.get(id)
- if exist {
- t.Fatal("autoClean: item still exist")
- }
- }
-}
-
-// func snapshotTest(t *testing.T) {
-// }
diff --git a/server/libs/logutil/logutil.go b/server/libs/logutil/logutil.go
deleted file mode 100644
index 15b2f6a..0000000
--- a/server/libs/logutil/logutil.go
+++ /dev/null
@@ -1,7 +0,0 @@
-package logutil
-
-type LogUtil interface {
- Print(v ...interface{})
- Printf(format string, v ...interface{})
- Println(v ...interface{})
-}
diff --git a/server/libs/logutil/slogger.go b/server/libs/logutil/slogger.go
deleted file mode 100644
index f0cd3f6..0000000
--- a/server/libs/logutil/slogger.go
+++ /dev/null
@@ -1,12 +0,0 @@
-package logutil
-
-import (
- "io"
- "log"
-)
-
-func NewSlog(out io.Writer, prefix string) LogUtil {
- return log.New(out, prefix, log.Ldate|log.Ltime|log.Lshortfile)
-}
-
-type Slog *log.Logger
diff --git a/server/libs/qtube/downloader.go b/server/libs/qtube/downloader.go
deleted file mode 100644
index 9f8e0dd..0000000
--- a/server/libs/qtube/downloader.go
+++ /dev/null
@@ -1,13 +0,0 @@
-package qtube
-
-import (
- "net/http"
-)
-
-import (
- "github.com/ihexxa/quickshare/server/libs/fileidx"
-)
-
-type Downloader interface {
- ServeFile(res http.ResponseWriter, req *http.Request, fileInfo *fileidx.FileInfo) error
-}
diff --git a/server/libs/qtube/qtube.go b/server/libs/qtube/qtube.go
deleted file mode 100644
index e15f39a..0000000
--- a/server/libs/qtube/qtube.go
+++ /dev/null
@@ -1,280 +0,0 @@
-package qtube
-
-import (
- "errors"
- "fmt"
- "io"
- "net/http"
- "path/filepath"
- "strconv"
- "strings"
- "time"
-)
-
-import (
- "github.com/ihexxa/quickshare/server/libs/fileidx"
-)
-
-var (
- ErrCopy = errors.New("ServeFile: copy error")
- ErrUnknown = errors.New("ServeFile: unknown error")
-)
-
-type httpRange struct {
- start, length int64
-}
-
-func (ra *httpRange) GetStart() int64 {
- return ra.start
-}
-func (ra *httpRange) GetLength() int64 {
- return ra.length
-}
-func (ra *httpRange) SetStart(start int64) {
- ra.start = start
-}
-func (ra *httpRange) SetLength(length int64) {
- ra.length = length
-}
-
-func NewQTube(root string, copySpeed, maxRangeLen int64, filer FileReadSeekCloser) Downloader {
- return &QTube{
- Root: root,
- BytesPerSec: copySpeed,
- MaxRangeLen: maxRangeLen,
- Filer: filer,
- }
-}
-
-type QTube struct {
- Root string
- BytesPerSec int64
- MaxRangeLen int64
- Filer FileReadSeekCloser
-}
-
-type FileReadSeekCloser interface {
- Open(filePath string) (ReadSeekCloser, error)
-}
-
-type ReadSeekCloser interface {
- io.Reader
- io.Seeker
- io.Closer
-}
-
-const (
- ErrorInvalidRange = "ServeFile: invalid Range"
- ErrorInvalidSize = "ServeFile: invalid Range total size"
-)
-
-func (tb *QTube) ServeFile(res http.ResponseWriter, req *http.Request, fileInfo *fileidx.FileInfo) error {
- headerRange := req.Header.Get("Range")
-
- switch {
- case req.Method == http.MethodHead:
- res.Header().Set("Accept-Ranges", "bytes")
- res.Header().Set("Content-Length", fmt.Sprintf("%d", fileInfo.Uploaded))
- res.Header().Set("Content-Type", "application/octet-stream")
- res.WriteHeader(http.StatusOK)
-
- return nil
- case headerRange == "":
- return tb.serveAll(res, fileInfo)
- default:
- return tb.serveRanges(res, headerRange, fileInfo)
- }
-}
-
-func (tb *QTube) serveAll(res http.ResponseWriter, fileInfo *fileidx.FileInfo) error {
- res.Header().Set("Accept-Ranges", "bytes")
- res.Header().Set("Content-Disposition", fmt.Sprintf(`attachment; filename="%s"`, filepath.Base(fileInfo.PathLocal)))
- res.Header().Set("Content-Length", fmt.Sprintf("%d", fileInfo.Uploaded))
- res.Header().Set("Content-Type", "application/octet-stream")
- res.Header().Set("Last-Modified", time.Unix(fileInfo.ModTime, 0).UTC().Format(http.TimeFormat))
- res.WriteHeader(http.StatusOK)
-
- // TODO: need verify path
- file, openErr := tb.Filer.Open(filepath.Join(tb.Root, fileInfo.PathLocal))
- defer file.Close()
- if openErr != nil {
- return openErr
- }
-
- copyErr := tb.throttledCopyN(res, file, fileInfo.Uploaded)
- if copyErr != nil && copyErr != io.EOF {
- return copyErr
- }
-
- return nil
-}
-
-func (tb *QTube) serveRanges(res http.ResponseWriter, headerRange string, fileInfo *fileidx.FileInfo) error {
- ranges, rangeErr := getRanges(headerRange, fileInfo.Uploaded)
- if rangeErr != nil {
- http.Error(res, rangeErr.Error(), http.StatusRequestedRangeNotSatisfiable)
- return errors.New(rangeErr.Error())
- }
-
- switch {
- case len(ranges) == 1 || len(ranges) > 1:
- if tb.copyRange(res, ranges[0], fileInfo) != nil {
- return ErrCopy
- }
- default:
- // TODO: add support for multiple ranges
- return ErrUnknown
- }
-
- return nil
-}
-
-func getRanges(headerRange string, size int64) ([]httpRange, error) {
- ranges, raParseErr := parseRange(headerRange, size)
- // TODO: check max number of ranges, range start end
- if len(ranges) <= 0 || raParseErr != nil {
- return nil, errors.New(ErrorInvalidRange)
- }
- if sumRangesSize(ranges) > size {
- return nil, errors.New(ErrorInvalidSize)
- }
-
- return ranges, nil
-}
-
-func (tb *QTube) copyRange(res http.ResponseWriter, ra httpRange, fileInfo *fileidx.FileInfo) error {
- // TODO: comfirm this wont cause problem
- if ra.GetLength() > tb.MaxRangeLen {
- ra.SetLength(tb.MaxRangeLen)
- }
-
- // TODO: add headers(ETag): https://tools.ietf.org/html/rfc7233#section-4.1 p11 2nd paragraph
- res.Header().Set("Accept-Ranges", "bytes")
- res.Header().Set("Content-Disposition", fmt.Sprintf(`attachment; filename="%s"`, filepath.Base(fileInfo.PathLocal)))
- res.Header().Set("Content-Type", "application/octet-stream")
- res.Header().Set("Content-Range", fmt.Sprintf("bytes %d-%d/%d", ra.start, ra.start+ra.length-1, fileInfo.Uploaded))
- res.Header().Set("Content-Length", strconv.FormatInt(ra.GetLength(), 10))
- res.Header().Set("Last-Modified", time.Unix(fileInfo.ModTime, 0).UTC().Format(http.TimeFormat))
- res.WriteHeader(http.StatusPartialContent)
-
- // TODO: need verify path
- file, openErr := tb.Filer.Open(filepath.Join(tb.Root, fileInfo.PathLocal))
- defer file.Close()
- if openErr != nil {
- return openErr
- }
-
- if _, seekErr := file.Seek(ra.start, io.SeekStart); seekErr != nil {
- return seekErr
- }
-
- copyErr := tb.throttledCopyN(res, file, ra.length)
- if copyErr != nil && copyErr != io.EOF {
- return copyErr
- }
-
- return nil
-}
-
-func (tb *QTube) throttledCopyN(dst io.Writer, src io.Reader, length int64) error {
- sum := int64(0)
- timeSlot := time.Duration(1 * time.Second)
-
- for sum < length {
- start := time.Now()
- chunkSize := length - sum
- if length-sum > tb.BytesPerSec {
- chunkSize = tb.BytesPerSec
- }
-
- copied, err := io.CopyN(dst, src, chunkSize)
- if err != nil {
- return err
- }
-
- sum += copied
- end := time.Now()
- if end.Before(start.Add(timeSlot)) {
- time.Sleep(start.Add(timeSlot).Sub(end))
- }
- }
-
- return nil
-}
-
-func parseRange(headerRange string, size int64) ([]httpRange, error) {
- if headerRange == "" {
- return nil, nil // header not present
- }
-
- const keyByte = "bytes="
- if !strings.HasPrefix(headerRange, keyByte) {
- return nil, errors.New("byte= not found")
- }
-
- var ranges []httpRange
- noOverlap := false
- for _, ra := range strings.Split(headerRange[len(keyByte):], ",") {
- ra = strings.TrimSpace(ra)
- if ra == "" {
- continue
- }
-
- i := strings.Index(ra, "-")
- if i < 0 {
- return nil, errors.New("- not found")
- }
-
- start, end := strings.TrimSpace(ra[:i]), strings.TrimSpace(ra[i+1:])
- var r httpRange
- if start == "" {
- i, err := strconv.ParseInt(end, 10, 64)
- if err != nil {
- return nil, errors.New("invalid range")
- }
- if i > size {
- i = size
- }
- r.start = size - i
- r.length = size - r.start
- } else {
- i, err := strconv.ParseInt(start, 10, 64)
- if err != nil || i < 0 {
- return nil, errors.New("invalid range")
- }
- if i >= size {
- // If the range begins after the size of the content,
- // then it does not overlap.
- noOverlap = true
- continue
- }
- r.start = i
- if end == "" {
- // If no end is specified, range extends to end of the file.
- r.length = size - r.start
- } else {
- i, err := strconv.ParseInt(end, 10, 64)
- if err != nil || r.start > i {
- return nil, errors.New("invalid range")
- }
- if i >= size {
- i = size - 1
- }
- r.length = i - r.start + 1
- }
- }
- ranges = append(ranges, r)
- }
- if noOverlap && len(ranges) == 0 {
- // The specified ranges did not overlap with the content.
- return nil, errors.New("parseRanges: no overlap")
- }
- return ranges, nil
-}
-
-func sumRangesSize(ranges []httpRange) (size int64) {
- for _, ra := range ranges {
- size += ra.length
- }
- return
-}
diff --git a/server/libs/qtube/qtube_test.go b/server/libs/qtube/qtube_test.go
deleted file mode 100644
index e980e8e..0000000
--- a/server/libs/qtube/qtube_test.go
+++ /dev/null
@@ -1,354 +0,0 @@
-package qtube
-
-import (
- "bytes"
- "fmt"
- "net/http"
- "strings"
- "testing"
- "time"
-)
-
-import (
- "github.com/ihexxa/quickshare/server/libs/fileidx"
-)
-
-// Range format examples:
-// Range: