Compare commits
7 Commits
0.0.4b
...
b3232e79d5
| Author | SHA1 | Date | |
|---|---|---|---|
| b3232e79d5 | |||
| 0a33d1b68d | |||
| 8518503d40 | |||
| fdc019a200 | |||
| 7bf88d9d8c | |||
| 7ec9432d7b | |||
| 044d49a9dc |
2
build.sh
2
build.sh
@@ -35,7 +35,7 @@ fi
|
||||
|
||||
## SERVER
|
||||
|
||||
platforms=("linux/amd64" "linux/arm64" "linux/riscv64" "linux/ppc64le")
|
||||
platforms=("linux/amd64" "linux/arm64" "linux/riscv64" "linux/ppc64le", "windows/amd64")
|
||||
|
||||
for platform in "${platforms[@]}"; do
|
||||
echo "* Compiling server for $platform..."
|
||||
|
||||
@@ -43,7 +43,7 @@ func (p *ListCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interface{})
|
||||
return subcommands.ExitUsageError
|
||||
}
|
||||
|
||||
username, password, err := credentials.Read()
|
||||
username, password, err := credentials.Read(f.Arg(0))
|
||||
if err != nil {
|
||||
fmt.Fprintf(os.Stderr, "error: failed to read std output: %s", err)
|
||||
return subcommands.ExitFailure
|
||||
|
||||
60
cmd/cli/commands/login/login.go
Normal file
60
cmd/cli/commands/login/login.go
Normal file
@@ -0,0 +1,60 @@
|
||||
package login
|
||||
|
||||
import (
|
||||
"cloudsave/cmd/cli/tools/prompt/credentials"
|
||||
"cloudsave/pkg/remote/client"
|
||||
"context"
|
||||
"flag"
|
||||
"fmt"
|
||||
"os"
|
||||
|
||||
"github.com/google/subcommands"
|
||||
)
|
||||
|
||||
type (
|
||||
LoginCmd struct {
|
||||
}
|
||||
)
|
||||
|
||||
func (*LoginCmd) Name() string { return "login" }
|
||||
func (*LoginCmd) Synopsis() string { return "save IN PLAIN TEXT your credentials" }
|
||||
func (*LoginCmd) Usage() string {
|
||||
return `Usage: cloudsave login <SERVER_HOSTNAME>
|
||||
|
||||
Warning: this command saves the login into a plain text json file
|
||||
|
||||
Options:
|
||||
`
|
||||
}
|
||||
|
||||
func (p *LoginCmd) SetFlags(f *flag.FlagSet) {
|
||||
}
|
||||
|
||||
func (p *LoginCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interface{}) subcommands.ExitStatus {
|
||||
if f.NArg() != 1 {
|
||||
fmt.Fprintf(os.Stderr, "error: this command take 1 argument")
|
||||
return subcommands.ExitUsageError
|
||||
}
|
||||
|
||||
server := f.Arg(0)
|
||||
|
||||
username, password, err := credentials.Read(server)
|
||||
if err != nil {
|
||||
fmt.Fprintf(os.Stderr, "error: failed to read std output: %s", err)
|
||||
return subcommands.ExitFailure
|
||||
}
|
||||
|
||||
cli := client.New(server, username, password)
|
||||
if _, err := cli.Version(); err != nil {
|
||||
fmt.Fprintf(os.Stderr, "error: failed to login: %s", err)
|
||||
return subcommands.ExitFailure
|
||||
}
|
||||
|
||||
if err := credentials.Login(username, password, server); err != nil {
|
||||
fmt.Fprintf(os.Stderr, "error: failed to save login: %s", err)
|
||||
return subcommands.ExitFailure
|
||||
}
|
||||
|
||||
fmt.Println("login information saved!")
|
||||
return subcommands.ExitSuccess
|
||||
}
|
||||
43
cmd/cli/commands/logout/logout.go
Normal file
43
cmd/cli/commands/logout/logout.go
Normal file
@@ -0,0 +1,43 @@
|
||||
package logout
|
||||
|
||||
import (
|
||||
"cloudsave/cmd/cli/tools/prompt/credentials"
|
||||
"context"
|
||||
"flag"
|
||||
"fmt"
|
||||
"os"
|
||||
|
||||
"github.com/google/subcommands"
|
||||
)
|
||||
|
||||
type (
|
||||
LogoutCmd struct {
|
||||
}
|
||||
)
|
||||
|
||||
func (*LogoutCmd) Name() string { return "logout" }
|
||||
func (*LogoutCmd) Synopsis() string { return "logout from a server" }
|
||||
func (*LogoutCmd) Usage() string {
|
||||
return `Usage: cloudsave logout <SERVER_HOSTNAME>
|
||||
|
||||
Options:
|
||||
`
|
||||
}
|
||||
|
||||
func (p *LogoutCmd) SetFlags(f *flag.FlagSet) {
|
||||
}
|
||||
|
||||
func (p *LogoutCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interface{}) subcommands.ExitStatus {
|
||||
if f.NArg() != 1 {
|
||||
fmt.Fprintf(os.Stderr, "error: this command take 1 argument")
|
||||
return subcommands.ExitUsageError
|
||||
}
|
||||
|
||||
if err := credentials.Logout(f.Arg(0)); err != nil {
|
||||
fmt.Fprintf(os.Stderr, "error: failed to logout: %s", err)
|
||||
return subcommands.ExitFailure
|
||||
}
|
||||
|
||||
fmt.Println("bye!")
|
||||
return subcommands.ExitSuccess
|
||||
}
|
||||
@@ -41,7 +41,7 @@ func (p *PullCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interface{})
|
||||
gameID := f.Arg(1)
|
||||
path := f.Arg(2)
|
||||
|
||||
username, password, err := credentials.Read()
|
||||
username, password, err := credentials.Read(url)
|
||||
if err != nil {
|
||||
fmt.Fprintf(os.Stderr, "error: failed to read std output: %s", err)
|
||||
return subcommands.ExitFailure
|
||||
|
||||
@@ -49,7 +49,7 @@ func (p *SyncCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interface{})
|
||||
r, err := remote.One(g.ID)
|
||||
if err != nil {
|
||||
if errors.Is(err, remote.ErrNoRemote) {
|
||||
fmt.Println(g.Name + ": no remote configured")
|
||||
fmt.Println("⬛", g.Name+": no remote configured")
|
||||
continue
|
||||
}
|
||||
fmt.Fprintln(os.Stderr, "error: failed to load datastore:", err)
|
||||
@@ -88,7 +88,7 @@ func (p *SyncCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interface{})
|
||||
slog.Warn("failed to push backup files", "err", err)
|
||||
}
|
||||
destroyPg()
|
||||
fmt.Println(g.Name + ": pushed")
|
||||
fmt.Println("⬆️", g.Name+": pushed")
|
||||
continue
|
||||
}
|
||||
|
||||
@@ -120,7 +120,7 @@ func (p *SyncCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interface{})
|
||||
continue
|
||||
}
|
||||
}
|
||||
fmt.Println(g.Name + ": already up-to-date")
|
||||
fmt.Println("🆗", g.Name+": already up-to-date")
|
||||
continue
|
||||
}
|
||||
|
||||
@@ -132,13 +132,13 @@ func (p *SyncCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interface{})
|
||||
return subcommands.ExitFailure
|
||||
}
|
||||
destroyPg()
|
||||
fmt.Println(g.Name + ": pushed")
|
||||
fmt.Println("⬆️", g.Name+": pushed")
|
||||
continue
|
||||
}
|
||||
|
||||
if g.Version < remoteMetadata.Version {
|
||||
destroyPg()
|
||||
if err := p.pull(r.GameID, cli); err != nil {
|
||||
if err := p.pull(g, cli); err != nil {
|
||||
destroyPg()
|
||||
fmt.Fprintln(os.Stderr, "failed to push:", err)
|
||||
return subcommands.ExitFailure
|
||||
@@ -152,7 +152,7 @@ func (p *SyncCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interface{})
|
||||
fmt.Fprintln(os.Stderr, "failed to push:", err)
|
||||
return subcommands.ExitFailure
|
||||
}
|
||||
fmt.Println(g.Name + ": pulled")
|
||||
fmt.Println("⬇️", g.Name+": pulled")
|
||||
continue
|
||||
}
|
||||
|
||||
@@ -179,7 +179,7 @@ func (p *SyncCmd) conflict(gameID string, m, remoteMetadata repository.Metadata,
|
||||
return nil
|
||||
}
|
||||
fmt.Println()
|
||||
fmt.Println("--- /!\\ CONFLICT ---")
|
||||
fmt.Println("--- ⚠️ CONFLICT ---")
|
||||
fmt.Println(g.Name, "(", g.Path, ")")
|
||||
fmt.Println("----")
|
||||
fmt.Println("Your version:", g.Date.Format(time.RFC1123))
|
||||
@@ -198,7 +198,7 @@ func (p *SyncCmd) conflict(gameID string, m, remoteMetadata repository.Metadata,
|
||||
|
||||
case prompt.Their:
|
||||
{
|
||||
if err := p.pull(gameID, cli); err != nil {
|
||||
if err := p.pull(g, cli); err != nil {
|
||||
return fmt.Errorf("failed to push: %w", err)
|
||||
}
|
||||
g.Version = remoteMetadata.Version
|
||||
@@ -266,8 +266,11 @@ func (p *SyncCmd) pullBackup(m repository.Metadata, cli *client.Client) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (p *SyncCmd) pull(gameID string, cli *client.Client) error {
|
||||
return p.Service.PullArchive(gameID, "", cli)
|
||||
func (p *SyncCmd) pull(g repository.Metadata, cli *client.Client) error {
|
||||
if err := p.Service.PullArchive(g.ID, "", cli); err != nil {
|
||||
return err
|
||||
}
|
||||
return p.Service.ApplyCurrent(g.ID)
|
||||
}
|
||||
|
||||
func connect(remoteCred map[string]map[string]string, r remote.Remote) (*client.Client, error) {
|
||||
@@ -278,7 +281,10 @@ func connect(remoteCred map[string]map[string]string, r remote.Remote) (*client.
|
||||
return cli, nil
|
||||
}
|
||||
|
||||
username, password, err := credentials.Read()
|
||||
fmt.Println()
|
||||
fmt.Println("Connexion to", r.URL)
|
||||
fmt.Println("============")
|
||||
username, password, err := credentials.Read(r.URL)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("failed to read std output: %w", err)
|
||||
}
|
||||
|
||||
@@ -42,7 +42,7 @@ func (p *VersionCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interface{
|
||||
return subcommands.ExitUsageError
|
||||
}
|
||||
|
||||
username, password, err := credentials.Read()
|
||||
username, password, err := credentials.Read(f.Arg(0))
|
||||
if err != nil {
|
||||
fmt.Fprintf(os.Stderr, "failed to read std output: %s", err)
|
||||
return subcommands.ExitFailure
|
||||
|
||||
@@ -4,6 +4,8 @@ import (
|
||||
"cloudsave/cmd/cli/commands/add"
|
||||
"cloudsave/cmd/cli/commands/apply"
|
||||
"cloudsave/cmd/cli/commands/list"
|
||||
"cloudsave/cmd/cli/commands/login"
|
||||
"cloudsave/cmd/cli/commands/logout"
|
||||
"cloudsave/cmd/cli/commands/pull"
|
||||
"cloudsave/cmd/cli/commands/remote"
|
||||
"cloudsave/cmd/cli/commands/remove"
|
||||
@@ -56,6 +58,8 @@ func main() {
|
||||
subcommands.Register(&remote.RemoteCmd{Service: s}, "remote")
|
||||
subcommands.Register(&sync.SyncCmd{Service: s}, "remote")
|
||||
subcommands.Register(&pull.PullCmd{Service: s}, "remote")
|
||||
subcommands.Register(&login.LoginCmd{}, "remote")
|
||||
subcommands.Register(&logout.LogoutCmd{}, "remote")
|
||||
|
||||
flag.Parse()
|
||||
ctx := context.Background()
|
||||
|
||||
@@ -2,14 +2,48 @@ package credentials
|
||||
|
||||
import (
|
||||
"bufio"
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"fmt"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
|
||||
"golang.org/x/term"
|
||||
)
|
||||
|
||||
func Read() (string, string, error) {
|
||||
type (
|
||||
credential struct {
|
||||
Username string `json:"username"`
|
||||
Password string `json:"password"`
|
||||
}
|
||||
|
||||
credentialsStore struct {
|
||||
Store map[string]credential `json:"store"`
|
||||
}
|
||||
)
|
||||
|
||||
var (
|
||||
datastorePath string
|
||||
)
|
||||
|
||||
func init() {
|
||||
roaming, err := os.UserConfigDir()
|
||||
if err != nil {
|
||||
panic("failed to get user config path: " + err.Error())
|
||||
}
|
||||
datastorePath = filepath.Join(roaming, "cloudsave")
|
||||
}
|
||||
|
||||
func Read(server string) (string, string, error) {
|
||||
var err error
|
||||
store, err := load()
|
||||
if err == nil {
|
||||
if c, ok := store[server]; ok {
|
||||
return c.Username, c.Password, nil
|
||||
}
|
||||
}
|
||||
|
||||
fmt.Print("Enter username: ")
|
||||
reader := bufio.NewReader(os.Stdin)
|
||||
username, _ := reader.ReadString('\n')
|
||||
@@ -24,3 +58,66 @@ func Read() (string, string, error) {
|
||||
|
||||
return username, string(password), nil
|
||||
}
|
||||
|
||||
func Login(username, password, server string) error {
|
||||
store, err := load()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
store[server] = credential{
|
||||
Username: username,
|
||||
Password: password,
|
||||
}
|
||||
|
||||
return save(store)
|
||||
}
|
||||
|
||||
func Logout(server string) error {
|
||||
store, err := load()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
delete(store, server)
|
||||
|
||||
return save(store)
|
||||
}
|
||||
|
||||
func save(store map[string]credential) error {
|
||||
c := credentialsStore{
|
||||
Store: store,
|
||||
}
|
||||
|
||||
f, err := os.OpenFile(filepath.Join(datastorePath, "credential.json"), os.O_CREATE|os.O_TRUNC|os.O_WRONLY, 0740)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to open datastore: %w", err)
|
||||
}
|
||||
defer f.Close()
|
||||
|
||||
e := json.NewEncoder(f)
|
||||
if err := e.Encode(c); err != nil {
|
||||
return fmt.Errorf("failed to encode data: %w", err)
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func load() (map[string]credential, error) {
|
||||
f, err := os.OpenFile(filepath.Join(datastorePath, "credential.json"), os.O_RDONLY, 0)
|
||||
if err != nil {
|
||||
if errors.Is(err, os.ErrNotExist) {
|
||||
return make(map[string]credential), nil
|
||||
}
|
||||
return nil, fmt.Errorf("failed to open datastore: %w", err)
|
||||
}
|
||||
defer f.Close()
|
||||
|
||||
var c credentialsStore
|
||||
d := json.NewDecoder(f)
|
||||
if err := d.Decode(&c); err != nil {
|
||||
return nil, fmt.Errorf("failed to decode data: %w", err)
|
||||
}
|
||||
|
||||
return c.Store, nil
|
||||
}
|
||||
|
||||
@@ -21,6 +21,7 @@ type (
|
||||
Server *http.Server
|
||||
Service *data.Service
|
||||
documentRoot string
|
||||
creds map[string]string
|
||||
}
|
||||
)
|
||||
|
||||
@@ -32,6 +33,7 @@ func NewServer(documentRoot string, srv *data.Service, creds map[string]string,
|
||||
s := &HTTPServer{
|
||||
Service: srv,
|
||||
documentRoot: documentRoot,
|
||||
creds: creds,
|
||||
}
|
||||
router := chi.NewRouter()
|
||||
router.NotFound(func(writer http.ResponseWriter, request *http.Request) {
|
||||
@@ -46,7 +48,7 @@ func NewServer(documentRoot string, srv *data.Service, creds map[string]string,
|
||||
router.Use(middleware.Compress(5, "application/gzip"))
|
||||
router.Use(middleware.Heartbeat("/heartbeat"))
|
||||
router.Route("/api", func(routerAPI chi.Router) {
|
||||
routerAPI.Use(BasicAuth("cloudsave", creds))
|
||||
routerAPI.Use(s.BasicAuth("cloudsave"))
|
||||
routerAPI.Route("/v1", func(r chi.Router) {
|
||||
// Get information about the server
|
||||
r.Get("/version", s.Information)
|
||||
@@ -78,6 +80,10 @@ func NewServer(documentRoot string, srv *data.Service, creds map[string]string,
|
||||
return s
|
||||
}
|
||||
|
||||
func (s *HTTPServer) SetCredentials(creds map[string]string) {
|
||||
s.creds = creds
|
||||
}
|
||||
|
||||
func (s HTTPServer) all(w http.ResponseWriter, r *http.Request) {
|
||||
datastore, err := s.Service.AllGames()
|
||||
if err != nil {
|
||||
|
||||
@@ -20,7 +20,7 @@ func recoverMiddleware(next http.Handler) http.Handler {
|
||||
}
|
||||
|
||||
// BasicAuth implements a simple middleware handler for adding basic http auth to a route.
|
||||
func BasicAuth(realm string, creds map[string]string) func(next http.Handler) http.Handler {
|
||||
func (s *HTTPServer) BasicAuth(realm string) func(next http.Handler) http.Handler {
|
||||
return func(next http.Handler) http.Handler {
|
||||
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
user, pass, ok := r.BasicAuth()
|
||||
@@ -29,7 +29,7 @@ func BasicAuth(realm string, creds map[string]string) func(next http.Handler) ht
|
||||
return
|
||||
}
|
||||
|
||||
credPass := creds[user]
|
||||
credPass := s.creds[user]
|
||||
if err := bcrypt.CompareHashAndPassword([]byte(credPass), []byte(pass)); err != nil {
|
||||
basicAuthFailed(w, r, realm)
|
||||
return
|
||||
|
||||
@@ -5,12 +5,30 @@ package main
|
||||
import (
|
||||
"fmt"
|
||||
"os"
|
||||
"os/signal"
|
||||
"syscall"
|
||||
)
|
||||
|
||||
const defaultDocumentRoot string = "/var/lib/cloudsave"
|
||||
|
||||
var (
|
||||
updateChan chan struct{}
|
||||
)
|
||||
|
||||
func main() {
|
||||
run()
|
||||
updateChan = make(chan struct{})
|
||||
|
||||
sigc := make(chan os.Signal, 1)
|
||||
signal.Notify(sigc, syscall.SIGHUP)
|
||||
|
||||
go func() {
|
||||
for {
|
||||
<-sigc
|
||||
updateChan <- struct{}{}
|
||||
}
|
||||
}()
|
||||
|
||||
run(updateChan)
|
||||
}
|
||||
|
||||
func fatal(message string, exitCode int) {
|
||||
|
||||
@@ -2,16 +2,54 @@ package main
|
||||
|
||||
import (
|
||||
"cloudsave/pkg/tools/windows"
|
||||
_ "embed"
|
||||
"os"
|
||||
|
||||
"github.com/getlantern/systray"
|
||||
)
|
||||
|
||||
const defaultDocumentRoot string = "C:/ProgramData/CloudSave"
|
||||
const defaultDocumentRoot string = "C:\\ProgramData\\CloudSave"
|
||||
|
||||
//go:embed res/icon.ico
|
||||
var icon []byte
|
||||
|
||||
var (
|
||||
updateChan chan struct{}
|
||||
)
|
||||
|
||||
func main() {
|
||||
run()
|
||||
updateChan = make(chan struct{})
|
||||
go systray.Run(onReady, onExit)
|
||||
|
||||
run(updateChan)
|
||||
}
|
||||
|
||||
func fatal(message string, exitCode int) {
|
||||
windows.MessageBox(windows.NULL, message, "CloudSave", windows.MB_OK)
|
||||
os.Exit(exitCode)
|
||||
}
|
||||
|
||||
func onReady() {
|
||||
systray.SetTitle("CloudSave")
|
||||
systray.SetTooltip("CloudSave")
|
||||
systray.SetIcon(icon)
|
||||
|
||||
mReload := systray.AddMenuItem("Reload", "Reload the server data")
|
||||
mQuit := systray.AddMenuItem("Quit", "Quit the server")
|
||||
|
||||
go func() {
|
||||
<-mQuit.ClickedCh
|
||||
os.Exit(0)
|
||||
}()
|
||||
|
||||
go func() {
|
||||
for {
|
||||
<-mReload.ClickedCh
|
||||
updateChan <- struct{}{}
|
||||
}
|
||||
}()
|
||||
}
|
||||
|
||||
func onExit() {
|
||||
// clean up here
|
||||
}
|
||||
|
||||
BIN
cmd/server/res/icon.ico
Normal file
BIN
cmd/server/res/icon.ico
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 15 KiB |
@@ -14,7 +14,7 @@ import (
|
||||
"strconv"
|
||||
)
|
||||
|
||||
func run() {
|
||||
func run(updateChan <-chan struct{}) {
|
||||
fmt.Printf("CloudSave server -- v%s.%s.%s\n\n", constants.Version, runtime.GOOS, runtime.GOARCH)
|
||||
|
||||
var documentRoot string
|
||||
@@ -47,6 +47,7 @@ func run() {
|
||||
if err := r.Preload(); err != nil {
|
||||
fatal("failed to load datastore: "+err.Error(), 1)
|
||||
}
|
||||
|
||||
repo = r
|
||||
} else {
|
||||
slog.Info("loading lazy repository...")
|
||||
@@ -61,6 +62,21 @@ func run() {
|
||||
|
||||
server := api.NewServer(documentRoot, s, h.Content(), port)
|
||||
|
||||
go func() {
|
||||
for {
|
||||
<-updateChan
|
||||
if r, ok := repo.(*repository.EagerRepository); ok {
|
||||
r.Reload()
|
||||
}
|
||||
h, err := htpasswd.Open(filepath.Join(documentRoot, ".htpasswd"))
|
||||
if err != nil {
|
||||
fatal("failed to load .htpasswd: "+err.Error(), 1)
|
||||
}
|
||||
slog.Info("users loaded: " + strconv.Itoa(len(h.Content())) + " user(s) loaded")
|
||||
server.SetCredentials(h.Content())
|
||||
}
|
||||
}()
|
||||
|
||||
fmt.Println("server started at :" + strconv.Itoa(port))
|
||||
if err := server.Server.ListenAndServe(); err != nil {
|
||||
fatal("failed to start server: "+err.Error(), 1)
|
||||
|
||||
9
go.mod
9
go.mod
@@ -3,6 +3,7 @@ module cloudsave
|
||||
go 1.24
|
||||
|
||||
require (
|
||||
github.com/getlantern/systray v1.2.2
|
||||
github.com/go-chi/chi/v5 v5.2.1
|
||||
github.com/google/subcommands v1.2.0
|
||||
github.com/google/uuid v1.6.0
|
||||
@@ -12,7 +13,15 @@ require (
|
||||
)
|
||||
|
||||
require (
|
||||
github.com/getlantern/context v0.0.0-20190109183933-c447772a6520 // indirect
|
||||
github.com/getlantern/errors v0.0.0-20190325191628-abdb3e3e36f7 // indirect
|
||||
github.com/getlantern/golog v0.0.0-20190830074920-4ef2e798c2d7 // indirect
|
||||
github.com/getlantern/hex v0.0.0-20190417191902-c6586a6fe0b7 // indirect
|
||||
github.com/getlantern/hidden v0.0.0-20190325191715-f02dbb02be55 // indirect
|
||||
github.com/getlantern/ops v0.0.0-20190325191751-d70cb0d6f85f // indirect
|
||||
github.com/go-stack/stack v1.8.0 // indirect
|
||||
github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db // indirect
|
||||
github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c // indirect
|
||||
github.com/rivo/uniseg v0.4.7 // indirect
|
||||
golang.org/x/sys v0.33.0 // indirect
|
||||
)
|
||||
|
||||
27
go.sum
27
go.sum
@@ -1,30 +1,57 @@
|
||||
github.com/chengxilo/virtualterm v1.0.4 h1:Z6IpERbRVlfB8WkOmtbHiDbBANU7cimRIof7mk9/PwM=
|
||||
github.com/chengxilo/virtualterm v1.0.4/go.mod h1:DyxxBZz/x1iqJjFxTFcr6/x+jSpqN0iwWCOK1q10rlY=
|
||||
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/getlantern/context v0.0.0-20190109183933-c447772a6520 h1:NRUJuo3v3WGC/g5YiyF790gut6oQr5f3FBI88Wv0dx4=
|
||||
github.com/getlantern/context v0.0.0-20190109183933-c447772a6520/go.mod h1:L+mq6/vvYHKjCX2oez0CgEAJmbq1fbb/oNJIWQkBybY=
|
||||
github.com/getlantern/errors v0.0.0-20190325191628-abdb3e3e36f7 h1:6uJ+sZ/e03gkbqZ0kUG6mfKoqDb4XMAzMIwlajq19So=
|
||||
github.com/getlantern/errors v0.0.0-20190325191628-abdb3e3e36f7/go.mod h1:l+xpFBrCtDLpK9qNjxs+cHU6+BAdlBaxHqikB6Lku3A=
|
||||
github.com/getlantern/golog v0.0.0-20190830074920-4ef2e798c2d7 h1:guBYzEaLz0Vfc/jv0czrr2z7qyzTOGC9hiQ0VC+hKjk=
|
||||
github.com/getlantern/golog v0.0.0-20190830074920-4ef2e798c2d7/go.mod h1:zx/1xUUeYPy3Pcmet8OSXLbF47l+3y6hIPpyLWoR9oc=
|
||||
github.com/getlantern/hex v0.0.0-20190417191902-c6586a6fe0b7 h1:micT5vkcr9tOVk1FiH8SWKID8ultN44Z+yzd2y/Vyb0=
|
||||
github.com/getlantern/hex v0.0.0-20190417191902-c6586a6fe0b7/go.mod h1:dD3CgOrwlzca8ed61CsZouQS5h5jIzkK9ZWrTcf0s+o=
|
||||
github.com/getlantern/hidden v0.0.0-20190325191715-f02dbb02be55 h1:XYzSdCbkzOC0FDNrgJqGRo8PCMFOBFL9py72DRs7bmc=
|
||||
github.com/getlantern/hidden v0.0.0-20190325191715-f02dbb02be55/go.mod h1:6mmzY2kW1TOOrVy+r41Za2MxXM+hhqTtY3oBKd2AgFA=
|
||||
github.com/getlantern/ops v0.0.0-20190325191751-d70cb0d6f85f h1:wrYrQttPS8FHIRSlsrcuKazukx/xqO/PpLZzZXsF+EA=
|
||||
github.com/getlantern/ops v0.0.0-20190325191751-d70cb0d6f85f/go.mod h1:D5ao98qkA6pxftxoqzibIBBrLSUli+kYnJqrgBf9cIA=
|
||||
github.com/getlantern/systray v1.2.2 h1:dCEHtfmvkJG7HZ8lS/sLklTH4RKUcIsKrAD9sThoEBE=
|
||||
github.com/getlantern/systray v1.2.2/go.mod h1:pXFOI1wwqwYXEhLPm9ZGjS2u/vVELeIgNMY5HvhHhcE=
|
||||
github.com/go-chi/chi/v5 v5.2.1 h1:KOIHODQj58PmL80G2Eak4WdvUzjSJSm0vG72crDCqb8=
|
||||
github.com/go-chi/chi/v5 v5.2.1/go.mod h1:L2yAIGWB3H+phAw1NxKwWM+7eUH/lU8pOMm5hHcoops=
|
||||
github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=
|
||||
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
|
||||
github.com/google/subcommands v1.2.0 h1:vWQspBTo2nEqTUFita5/KeEWlUL8kQObDFbub/EN9oE=
|
||||
github.com/google/subcommands v1.2.0/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk=
|
||||
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
|
||||
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
||||
github.com/lxn/walk v0.0.0-20210112085537-c389da54e794/go.mod h1:E23UucZGqpuUANJooIbHWCufXvOcT6E7Stq81gU+CSQ=
|
||||
github.com/lxn/win v0.0.0-20210218163916-a377121e959e/go.mod h1:KxxjdtRkfNoYDCUP5ryK7XJJNTnpC8atvtmTheChOtk=
|
||||
github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc=
|
||||
github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
|
||||
github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db h1:62I3jR2EmQ4l5rM/4FEfDWcRD+abF5XlKShorW5LRoQ=
|
||||
github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db/go.mod h1:l0dey0ia/Uv7NcFFVbCLtqEBQbrT4OCwCSKTEv6enCw=
|
||||
github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c h1:rp5dCmg/yLR3mgFuSOe4oEnDDmGLROTvMragMUXpTQw=
|
||||
github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c/go.mod h1:X07ZCGwUbLaax7L0S3Tw4hpejzu63ZrrQiUe6W0hcy0=
|
||||
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
||||
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||
github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
|
||||
github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
|
||||
github.com/schollz/progressbar/v3 v3.18.0 h1:uXdoHABRFmNIjUfte/Ex7WtuyVslrw2wVPQmCN62HpA=
|
||||
github.com/schollz/progressbar/v3 v3.18.0/go.mod h1:IsO3lpbaGuzh8zIMzgY3+J8l4C8GjO0Y9S69eFvNsec=
|
||||
github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966/go.mod h1:sUM3LWHvSMaG192sy56D9F7CNvL7jUJVXoqM1QKLnog=
|
||||
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
||||
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
|
||||
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
|
||||
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
|
||||
golang.org/x/crypto v0.38.0 h1:jt+WWG8IZlBnVbomuhg2Mdq0+BBQaHbtqHEFEigjUV8=
|
||||
golang.org/x/crypto v0.38.0/go.mod h1:MvrbAqul58NNYPKnOra203SB9vpuZW0e+RRZV+Ggqjw=
|
||||
golang.org/x/sys v0.0.0-20201018230417-eeed37f84f13/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
|
||||
golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
|
||||
golang.org/x/term v0.32.0 h1:DR4lr0TjUs3epypdhTOkMmuF5CDFJ/8pOnbzMZPQ7bg=
|
||||
golang.org/x/term v0.32.0/go.mod h1:uZG1FhGx848Sqfsq4/DlJr3xGGsYMu/L5GW4abiaEPQ=
|
||||
gopkg.in/Knetic/govaluate.v3 v3.0.0/go.mod h1:csKLBORsPbafmSCGTEh3U7Ozmsuq8ZSIlKk1bcqph0E=
|
||||
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
||||
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||
|
||||
19
jenkinsfile
Normal file
19
jenkinsfile
Normal file
@@ -0,0 +1,19 @@
|
||||
pipeline {
|
||||
agent any
|
||||
|
||||
stages {
|
||||
stage('Audit') {
|
||||
steps {
|
||||
sh '''
|
||||
go install github.com/securego/gosec/v2/cmd/gosec@v2.22.8
|
||||
/var/lib/jenkins/go/bin/gosec ./...
|
||||
'''
|
||||
}
|
||||
}
|
||||
stage('Build') {
|
||||
steps {
|
||||
sh './build.sh'
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,5 @@
|
||||
package constants
|
||||
|
||||
const Version = "0.0.4b"
|
||||
const Version = "0.0.4d"
|
||||
|
||||
const ApiVersion = 1
|
||||
|
||||
@@ -4,6 +4,7 @@ import (
|
||||
"cloudsave/pkg/remote/client"
|
||||
"cloudsave/pkg/repository"
|
||||
"cloudsave/pkg/tools/archive"
|
||||
"errors"
|
||||
"fmt"
|
||||
"io"
|
||||
"os"
|
||||
@@ -134,6 +135,9 @@ func (s *Service) MakeBackup(gameID string) error {
|
||||
|
||||
src, err := s.repo.ReadBlob(id)
|
||||
if err != nil {
|
||||
if errors.Is(err, repository.ErrNotFound) {
|
||||
return nil
|
||||
}
|
||||
return err
|
||||
}
|
||||
if v, ok := src.(io.Closer); ok {
|
||||
@@ -248,6 +252,12 @@ func (l Service) PullCurrent(id, path string, cli *client.Client) error {
|
||||
return fmt.Errorf("failed to open blob from local repository: %w", err)
|
||||
}
|
||||
|
||||
if _, err := os.Stat(path); err == nil {
|
||||
if err := os.RemoveAll(path); err != nil {
|
||||
return fmt.Errorf("failed to clean the destination directory: %w", err)
|
||||
}
|
||||
}
|
||||
|
||||
if err := os.MkdirAll(path, 0740); err != nil {
|
||||
return fmt.Errorf("failed to create destination directory: %w", err)
|
||||
}
|
||||
|
||||
@@ -224,6 +224,11 @@ func (c *Client) Pull(gameID, archivePath string) error {
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to open file: %w", err)
|
||||
}
|
||||
defer func() {
|
||||
if err := os.Rename(archivePath+".part", archivePath); err != nil {
|
||||
panic(err)
|
||||
}
|
||||
}()
|
||||
defer f.Close()
|
||||
|
||||
res, err := cli.Do(req)
|
||||
@@ -246,8 +251,10 @@ func (c *Client) Pull(gameID, archivePath string) error {
|
||||
return fmt.Errorf("an error occured while copying the file from the remote: %w", err)
|
||||
}
|
||||
|
||||
if err := os.Rename(archivePath+".part", archivePath); err != nil {
|
||||
return fmt.Errorf("failed to move temporary data: %w", err)
|
||||
if err := os.Remove(archivePath); err != nil {
|
||||
if !errors.Is(err, os.ErrNotExist) {
|
||||
return fmt.Errorf("failed to remove the old version of the archive: %w", err)
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
|
||||
@@ -313,6 +313,9 @@ func (l *LazyRepository) ReadBlob(id Identifier) (io.ReadSeekCloser, error) {
|
||||
slog.Debug("loading read buffer...", "id", id)
|
||||
dst, err := os.OpenFile(filepath.Join(path, "data.tar.gz"), os.O_RDONLY, 0)
|
||||
if err != nil {
|
||||
if errors.Is(err, os.ErrNotExist) {
|
||||
return nil, fmt.Errorf("failed to open blob: %w", ErrNotFound)
|
||||
}
|
||||
return nil, fmt.Errorf("failed to open blob: %w", err)
|
||||
}
|
||||
|
||||
@@ -398,6 +401,7 @@ func (r *EagerRepository) Preload() error {
|
||||
r.mu.Lock()
|
||||
defer r.mu.Unlock()
|
||||
|
||||
slog.Info("loading data from datastore to memory...")
|
||||
games, err := r.Repository.All()
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to load all data: %w", err)
|
||||
@@ -440,6 +444,21 @@ func (r *EagerRepository) Preload() error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (r *EagerRepository) ClearCache() {
|
||||
r.mu.Lock()
|
||||
defer r.mu.Unlock()
|
||||
|
||||
slog.Info("clearing cache...")
|
||||
for k := range r.data {
|
||||
delete(r.data, k)
|
||||
}
|
||||
}
|
||||
|
||||
func (r *EagerRepository) Reload() error {
|
||||
r.ClearCache()
|
||||
return r.Preload()
|
||||
}
|
||||
|
||||
func (r *EagerRepository) All() ([]string, error) {
|
||||
r.mu.RLock()
|
||||
defer r.mu.RUnlock()
|
||||
|
||||
Reference in New Issue
Block a user