Cadoles/altcha-server
22
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

divers refacto

Browse Source
This commit is contained in:
Valentin Carroy
2024-09-13 09:12:16 +02:00
parent 1139bfe73f
commit e90b6a57d8
6 changed files with 84 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
internal/command/generate.go
View File

@ -2,6 +2,7 @@ package command
import (
"fmt"
"time"
"forge.cadoles.com/cadoles/altcha-server/internal/client"
"forge.cadoles.com/cadoles/altcha-server/internal/command/common"
@ -21,12 +22,23 @@ func GenerateCommand() *cli.Command {
Action: func(ctx *cli.Context) error {
cfg := config.Config{}
if err := env.Parse(&cfg); err != nil {
fmt.Printf("%+v\n", err)
logger.Error(ctx.Context, err.Error())
return err
}
c := client.NewClient(cfg.HmacKey, cfg.MaxNumber, cfg.Algorithm, cfg.Salt, cfg.Expire, cfg.CheckExpire)
challenge, err := c.Generate()
expirationDuration, err := time.ParseDuration(cfg.Expire+"s")
if err != nil {
logger.Error(ctx.Context, err.Error())
return err
}
client, err := client.New(cfg.HmacKey, cfg.MaxNumber, cfg.Algorithm, cfg.Salt, expirationDuration, cfg.CheckExpire)
if err != nil {
logger.Error(ctx.Context, err.Error())
return err
}
challenge, err := client.Generate()
if err != nil {
logger.Error(ctx.Context, err.Error())
return err

13
internal/command/run.go
View File

@ -1,13 +1,12 @@
package command
import (
"fmt"
"forge.cadoles.com/cadoles/altcha-server/internal/api"
"forge.cadoles.com/cadoles/altcha-server/internal/command/common"
"forge.cadoles.com/cadoles/altcha-server/internal/config"
"github.com/caarlos0/env/v11"
"github.com/urfave/cli/v2"
"gitlab.com/wpetit/goweb/logger"
)
func RunCommand() *cli.Command {
@ -20,10 +19,16 @@ func RunCommand() *cli.Command {
Action: func(ctx *cli.Context) error {
cfg := config.Config{}
if err := env.Parse(&cfg); err != nil {
fmt.Printf("%+v\n", err)
logger.Error(ctx.Context, err.Error())
return err
}
server, err := api.NewServer(cfg)
if err != nil {
logger.Error(ctx.Context, err.Error())
return err
}
api.NewServer(cfg).Run(ctx.Context)
server.Run(ctx.Context)
return nil
},
}

17
internal/command/solve.go
View File

@ -2,6 +2,7 @@ package command
import (
"fmt"
"time"
"forge.cadoles.com/cadoles/altcha-server/internal/client"
"forge.cadoles.com/cadoles/altcha-server/internal/command/common"
@ -23,16 +24,26 @@ func SolveCommand() *cli.Command {
Action: func(ctx *cli.Context) error {
cfg := config.Config{}
if err := env.Parse(&cfg); err != nil {
fmt.Printf("%+v\n", err)
logger.Error(ctx.Context, err.Error())
return err
}
challenge := ctx.Args().Get(0)
salt := ctx.Args().Get(1)
c := client.NewClient(cfg.HmacKey, cfg.MaxNumber, cfg.Algorithm, salt, cfg.Expire, cfg.CheckExpire)
expirationDuration, err := time.ParseDuration(cfg.Expire+"s")
if err != nil {
logger.Error(ctx.Context, err.Error())
return err
}
client, err := client.New(cfg.HmacKey, cfg.MaxNumber, cfg.Algorithm, salt, expirationDuration, cfg.CheckExpire)
if err != nil {
logger.Error(ctx.Context, err.Error())
return err
}
solution, err := c.Solve(challenge)
solution, err := client.Solve(challenge)
if err != nil {
logger.Error(ctx.Context, err.Error())

20
internal/command/verify.go
View File

@ -3,6 +3,7 @@ package command
import (
"fmt"
"strconv"
"time"
"forge.cadoles.com/cadoles/altcha-server/internal/client"
"forge.cadoles.com/cadoles/altcha-server/internal/command/common"
@ -10,6 +11,7 @@ import (
"github.com/altcha-org/altcha-lib-go"
"github.com/caarlos0/env/v11"
"github.com/urfave/cli/v2"
"gitlab.com/wpetit/goweb/logger"
)
func VerifyCommand() *cli.Command {
@ -24,7 +26,8 @@ func VerifyCommand() *cli.Command {
Action: func(ctx *cli.Context) error {
cfg := config.Config{}
if err := env.Parse(&cfg); err != nil {
fmt.Printf("%+v\n", err)
logger.Error(ctx.Context, err.Error())
return err
}
challenge := ctx.Args().Get(0)
@ -32,7 +35,17 @@ func VerifyCommand() *cli.Command {
signature := ctx.Args().Get(2)
solution, _ := strconv.ParseInt(ctx.Args().Get(3), 10, 64)
c := client.NewClient(cfg.HmacKey, cfg.MaxNumber, cfg.Algorithm, cfg.Salt, cfg.Expire, cfg.CheckExpire)
expirationDuration, err := time.ParseDuration(cfg.Expire+"s")
if err != nil {
logger.Error(ctx.Context, err.Error())
return err
}
client, err := client.New(cfg.HmacKey, cfg.MaxNumber, cfg.Algorithm, cfg.Salt, expirationDuration, cfg.CheckExpire)
if err != nil {
logger.Error(ctx.Context, err.Error())
return err
}
payload := altcha.Payload{
Algorithm: cfg.Algorithm,
@ -42,9 +55,10 @@ func VerifyCommand() *cli.Command {
Signature: signature,
}
verified, err := c.VerifySolution(payload)
verified, err := client.VerifySolution(payload)
if err != nil {
logger.Error(ctx.Context, err.Error())
return err
}