-
Notifications
You must be signed in to change notification settings - Fork 84
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* feat: add dashboard login * feat: add subcommand for dashboard login * feat: add dashboard login command test * feat: show encrypted file in web file list * feat: add cros for token intercept * feat: change dashboard api response * feat: add two step check for some url * feat: add dashboard logout * feat: transfer api two step validate * chore: format * test: add dashboard command test * feat: upgrade dependency of btfs * style: go fmt * ci: upgrade golang version * test: fix test problem * style: format * feat: upload encrypted file * feat: change encrypt file argument sequence * fix: timeout for decrypt * feat: ignore local cmd * feat: get api host from config * feat: remove file-related commands * feat: deprecate object command * feat: remove tar-related commands * feat: ignore config show path. * feat: update version and cid * fix: two step check for transfer op * feat: resource manage use json file * feat: update dashboard cid --------- Co-authored-by: cody <mengxiaole269@gmail.com> Co-authored-by: cody <cody.meng@tron.com> Co-authored-by: Cody <133026515+mengcody@users.noreply.github.com>
- Loading branch information
4 people
authored
Oct 30, 2024
1 parent
83008eb
commit 6f917f0
Showing
72 changed files
with
1,454 additions
and
1,046 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| FROM golang:1.18 | ||
| FROM golang:1.22 | ||
| MAINTAINER TRON-US <support@tron.network> | ||
|
|
||
| # Install deps | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| FROM golang:1.18 | ||
| FROM golang:1.22 | ||
| MAINTAINER TRON-US <support@tron.network> | ||
|
|
||
| # Install deps | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,234 @@ | ||
| package commands | ||
|
|
||
| import ( | ||
| "encoding/hex" | ||
| "errors" | ||
| cmds "github.com/bittorrent/go-btfs-cmds" | ||
| "github.com/bittorrent/go-btfs/core/commands/cmdenv" | ||
| "github.com/bittorrent/go-btfs/utils" | ||
| ds "github.com/ipfs/go-datastore" | ||
| ) | ||
|
|
||
| const DashboardPasswordPrefix = "/dashboard_password" | ||
| const TokenExpire = 60 * 60 * 24 * 1 | ||
|
|
||
| var IsLogin bool | ||
|
|
||
| type DashboardResponse struct { | ||
| Success bool | ||
| Text string | ||
| } | ||
|
|
||
| var dashboardCmd = &cmds.Command{ | ||
| Helptext: cmds.HelpText{ | ||
| Tagline: "dashboard password operation", | ||
| }, | ||
|
|
||
| Subcommands: map[string]*cmds.Command{ | ||
| "check": checkCmd, | ||
| "set": setCmd, | ||
| "reset": resetCmd, | ||
| "change": changeCmd, | ||
| "login": loginCmd, | ||
| "logout": logoutCmd, | ||
| "validate": validateCmd, | ||
| }, | ||
| } | ||
|
|
||
| var checkCmd = &cmds.Command{ | ||
| Helptext: cmds.HelpText{ | ||
| Tagline: "check if password is set", | ||
| }, | ||
| Run: func(req *cmds.Request, re cmds.ResponseEmitter, env cmds.Environment) error { | ||
| node, err := cmdenv.GetNode(env) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| _, err = node.Repo.Datastore().Get(req.Context, ds.NewKey(DashboardPasswordPrefix)) | ||
|
|
||
| if err != nil && errors.Is(err, ds.ErrNotFound) { | ||
| return re.Emit(&DashboardResponse{Success: false, Text: "passwd is not set"}) | ||
| } | ||
|
|
||
| if err != nil { | ||
| log.Info("check password error", err) | ||
| return err | ||
| } | ||
| return re.Emit(DashboardResponse{Success: true, Text: "password was set"}) | ||
| }, | ||
| } | ||
|
|
||
| var setCmd = &cmds.Command{ | ||
| Helptext: cmds.HelpText{ | ||
| Tagline: "set password", | ||
| }, | ||
| Arguments: []cmds.Argument{ | ||
| cmds.StringArg("password", true, false, "set password"), | ||
| }, | ||
| Run: func(req *cmds.Request, re cmds.ResponseEmitter, env cmds.Environment) error { | ||
| node, err := cmdenv.GetNode(env) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| // check if password has set | ||
| _, err = node.Repo.Datastore().Get(req.Context, ds.NewKey(DashboardPasswordPrefix)) | ||
| if err != nil && !errors.Is(err, ds.ErrNotFound) { | ||
| log.Info("set password error", err) | ||
| return err | ||
| } | ||
|
|
||
| if err == nil { | ||
| return re.Emit(&DashboardResponse{ | ||
| Success: false, | ||
| Text: "password has set, if you want to reset your password, please use reset command instead", | ||
| }) | ||
| } | ||
|
|
||
| datastore := node.Repo.Datastore() | ||
| key := ds.NewKey(DashboardPasswordPrefix) | ||
| err = datastore.Put(req.Context, key, []byte(req.Arguments[0])) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| return re.Emit(&DashboardResponse{Success: true, Text: "password set success!"}) | ||
| }, | ||
| } | ||
|
|
||
| var loginCmd = &cmds.Command{ | ||
| Helptext: cmds.HelpText{ | ||
| Tagline: "login with passwd and get the token", | ||
| }, | ||
| Arguments: []cmds.Argument{ | ||
| cmds.StringArg("password", true, false, "set password"), | ||
| }, | ||
| Run: func(req *cmds.Request, re cmds.ResponseEmitter, env cmds.Environment) error { | ||
| node, err := cmdenv.GetNode(env) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| value, err := node.Repo.Datastore().Get(req.Context, ds.NewKey(DashboardPasswordPrefix)) | ||
| if errors.Is(err, ds.ErrNotFound) { | ||
| return re.Emit(&DashboardResponse{Success: false, Text: "password has not set, please set passwd first"}) | ||
| } | ||
| if err != nil { | ||
| return err | ||
| } | ||
| if string(value) != req.Arguments[0] { | ||
| log.Info("login password is correct") | ||
| return re.Emit(&DashboardResponse{Success: false, Text: "password is not correct"}) | ||
| } | ||
|
|
||
| config, err := node.Repo.Config() | ||
|
|
||
| publicKey := config.Identity.PeerID | ||
|
|
||
| token, err := utils.GenerateToken(publicKey, string(value), TokenExpire) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| IsLogin = true | ||
|
|
||
| return re.Emit(&DashboardResponse{ | ||
| Success: true, | ||
| Text: token, | ||
| }) | ||
| }, | ||
| } | ||
|
|
||
| var resetCmd = &cmds.Command{ | ||
| Helptext: cmds.HelpText{ | ||
| Tagline: "reset password", | ||
| }, | ||
| Arguments: []cmds.Argument{ | ||
| cmds.StringArg("privateKey", true, false, "private key"), | ||
| cmds.StringArg("newPassword", true, false, "new password"), | ||
| }, | ||
|
|
||
| Run: func(req *cmds.Request, re cmds.ResponseEmitter, env cmds.Environment) error { | ||
| node, err := cmdenv.GetNode(env) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| raw, err := node.PrivateKey.Raw() | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| if hex.EncodeToString(raw) != req.Arguments[0] { | ||
| return re.Emit(&DashboardResponse{Success: false, Text: "private key is not correct"}) | ||
| } | ||
| datastore := node.Repo.Datastore() | ||
| err = datastore.Put(req.Context, ds.NewKey(DashboardPasswordPrefix), []byte(req.Arguments[1])) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| return re.Emit(&DashboardResponse{Success: true, Text: "password reset success!"}) | ||
| }, | ||
| } | ||
|
|
||
| var changeCmd = &cmds.Command{ | ||
| Helptext: cmds.HelpText{ | ||
| Tagline: "change password", | ||
| }, | ||
| Arguments: []cmds.Argument{ | ||
| cmds.StringArg("oldPassword", true, false, "change password"), | ||
| cmds.StringArg("newPassword", true, false, "change password"), | ||
| }, | ||
| Run: func(req *cmds.Request, re cmds.ResponseEmitter, env cmds.Environment) error { | ||
| node, err := cmdenv.GetNode(env) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| datastore := node.Repo.Datastore() | ||
| value, err := datastore.Get(req.Context, ds.NewKey(DashboardPasswordPrefix)) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| if string(value) != req.Arguments[0] { | ||
| return re.Emit(&DashboardResponse{Success: false, Text: "the old password is not correct"}) | ||
| } | ||
| err = datastore.Put(req.Context, ds.NewKey(DashboardPasswordPrefix), []byte(req.Arguments[1])) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| return re.Emit(&DashboardResponse{Success: true, Text: "password change success!"}) | ||
| }, | ||
| } | ||
|
|
||
| var logoutCmd = &cmds.Command{ | ||
| Helptext: cmds.HelpText{ | ||
| Tagline: "logout", | ||
| }, | ||
| Run: func(req *cmds.Request, re cmds.ResponseEmitter, env cmds.Environment) error { | ||
| IsLogin = false | ||
| return re.Emit(&DashboardResponse{Success: true, Text: "logout success!"}) | ||
| }, | ||
| } | ||
|
|
||
| var validateCmd = &cmds.Command{ | ||
| Helptext: cmds.HelpText{ | ||
| Tagline: "validate passwd", | ||
| }, | ||
| Arguments: []cmds.Argument{ | ||
| cmds.StringArg("password", true, false, "validate passwd"), | ||
| }, | ||
| Run: func(r *cmds.Request, re cmds.ResponseEmitter, env cmds.Environment) error { | ||
| node, err := cmdenv.GetNode(env) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| datastore := node.Repo.Datastore() | ||
| value, err := datastore.Get(r.Context, ds.NewKey(DashboardPasswordPrefix)) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| if string(value) != r.Arguments[0] { | ||
| return re.Emit(&DashboardResponse{Success: false, Text: "password is not correct"}) | ||
| } | ||
| return re.Emit(&DashboardResponse{Success: true, Text: "password is correct"}) | ||
| }, | ||
| } |
Oops, something went wrong.