mirror of
https://github.com/schollz/croc.git
synced 2025-10-10 21:01:02 +02:00
fixes so it works (basically)
This commit is contained in:
Zack Scholl
parent
b9dad87526
commit
274fab92a1
8 changed files with 264 additions and 136 deletions
238
main.go
238
main.go
|
|
@ -1,131 +1,127 @@
|
|||
package main
|
||||
|
||||
import (
|
||||
log "github.com/cihub/seelog"
|
||||
"github.com/schollz/croc/src/logger"
|
||||
"errors"
|
||||
"fmt"
|
||||
"os"
|
||||
"time"
|
||||
|
||||
"github.com/schollz/croc/src/croc"
|
||||
"github.com/urfave/cli"
|
||||
)
|
||||
|
||||
var version string
|
||||
var codePhrase string
|
||||
|
||||
var cr *croc.Croc
|
||||
|
||||
func main() {
|
||||
defer log.Flush()
|
||||
logger.SetLogLevel("debug")
|
||||
log.Debug("hi")
|
||||
app := cli.NewApp()
|
||||
app.Name = "croc"
|
||||
if version == "" {
|
||||
version = "dev"
|
||||
}
|
||||
|
||||
app.Version = version
|
||||
app.Compiled = time.Now()
|
||||
app.Usage = "easily and securely transfer stuff from one computer to another"
|
||||
app.UsageText = "croc allows any two computers to directly and securely transfer files"
|
||||
// app.ArgsUsage = "[args and such]"
|
||||
app.Commands = []cli.Command{
|
||||
{
|
||||
Name: "send",
|
||||
Usage: "send a file",
|
||||
Description: "send a file over the relay",
|
||||
ArgsUsage: "[filename]",
|
||||
Flags: []cli.Flag{
|
||||
cli.BoolFlag{Name: "no-compress, o", Usage: "disable compression"},
|
||||
cli.BoolFlag{Name: "no-encrypt, e", Usage: "disable encryption"},
|
||||
cli.StringFlag{Name: "code, c", Usage: "codephrase used to connect to relay"},
|
||||
},
|
||||
HelpName: "croc send",
|
||||
Action: func(c *cli.Context) error {
|
||||
return send(c)
|
||||
},
|
||||
},
|
||||
{
|
||||
Name: "relay",
|
||||
Usage: "start a croc relay",
|
||||
Description: "the croc relay will handle websocket and TCP connections",
|
||||
Flags: []cli.Flag{
|
||||
cli.StringFlag{Name: "port", Value: "8152", Usage: "port that the websocket listens on"},
|
||||
cli.StringFlag{Name: "curve", Value: "siec", Usage: "specify elliptic curve to use (p224, p256, p384, p521, siec)"},
|
||||
},
|
||||
HelpName: "croc relay",
|
||||
Action: func(c *cli.Context) error {
|
||||
return relay(c)
|
||||
},
|
||||
},
|
||||
}
|
||||
app.Flags = []cli.Flag{
|
||||
cli.StringFlag{Name: "relay", Value: "ws://localhost:8152"},
|
||||
cli.BoolFlag{Name: "no-local", Usage: "disable local mode"},
|
||||
cli.BoolFlag{Name: "local", Usage: "use only local mode"},
|
||||
cli.BoolFlag{Name: "debug", Usage: "increase verbosity (a lot)"},
|
||||
cli.BoolFlag{Name: "yes", Usage: "automatically agree to all prompts"},
|
||||
cli.BoolFlag{Name: "stdout", Usage: "redirect file to stdout"},
|
||||
}
|
||||
app.EnableBashCompletion = true
|
||||
app.HideHelp = false
|
||||
app.HideVersion = false
|
||||
app.BashComplete = func(c *cli.Context) {
|
||||
fmt.Fprintf(c.App.Writer, "send\nreceive\relay")
|
||||
}
|
||||
app.Action = func(c *cli.Context) error {
|
||||
return receive(c)
|
||||
}
|
||||
app.Before = func(c *cli.Context) error {
|
||||
cr = croc.Init(c.GlobalBool("debug"))
|
||||
cr.AllowLocalDiscovery = true
|
||||
cr.WebsocketAddress = c.GlobalString("relay")
|
||||
cr.Yes = c.GlobalBool("yes")
|
||||
cr.Stdout = c.GlobalBool("stdout")
|
||||
cr.LocalOnly = c.GlobalBool("local")
|
||||
cr.NoLocal = c.GlobalBool("no-local")
|
||||
return nil
|
||||
}
|
||||
|
||||
err := app.Run(os.Args)
|
||||
if err != nil {
|
||||
fmt.Printf("\nerror: %s", err.Error())
|
||||
}
|
||||
}
|
||||
|
||||
// var version string
|
||||
// var codePhrase string
|
||||
func send(c *cli.Context) error {
|
||||
stat, _ := os.Stdin.Stat()
|
||||
var fname string
|
||||
if (stat.Mode() & os.ModeCharDevice) == 0 {
|
||||
fname = "stdin"
|
||||
} else {
|
||||
fname = c.Args().First()
|
||||
}
|
||||
if fname == "" {
|
||||
return errors.New("must specify file: croc send [filename]")
|
||||
}
|
||||
cr.UseCompression = !c.Bool("no-compress")
|
||||
cr.UseEncryption = !c.Bool("no-encrypt")
|
||||
if c.String("code") != "" {
|
||||
codePhrase = c.String("code")
|
||||
}
|
||||
return cr.Send(fname, codePhrase)
|
||||
}
|
||||
|
||||
// var cr *croc.Croc
|
||||
func receive(c *cli.Context) error {
|
||||
if c.GlobalString("code") != "" {
|
||||
codePhrase = c.GlobalString("code")
|
||||
}
|
||||
if c.Args().First() != "" {
|
||||
codePhrase = c.Args().First()
|
||||
}
|
||||
return cr.Receive(codePhrase)
|
||||
}
|
||||
|
||||
// func main() {
|
||||
// app := cli.NewApp()
|
||||
// app.Name = "croc"
|
||||
// if version == "" {
|
||||
// version = "dev"
|
||||
// }
|
||||
|
||||
// app.Version = version
|
||||
// app.Compiled = time.Now()
|
||||
// app.Usage = "easily and securely transfer stuff from one computer to another"
|
||||
// app.UsageText = "croc allows any two computers to directly and securely transfer files"
|
||||
// // app.ArgsUsage = "[args and such]"
|
||||
// app.Commands = []cli.Command{
|
||||
// {
|
||||
// Name: "send",
|
||||
// Usage: "send a file",
|
||||
// Description: "send a file over the relay",
|
||||
// ArgsUsage: "[filename]",
|
||||
// Flags: []cli.Flag{
|
||||
// cli.BoolFlag{Name: "no-compress, o", Usage: "disable compression"},
|
||||
// cli.BoolFlag{Name: "no-encrypt, e", Usage: "disable encryption"},
|
||||
// cli.StringFlag{Name: "code, c", Usage: "codephrase used to connect to relay"},
|
||||
// },
|
||||
// HelpName: "croc send",
|
||||
// Action: func(c *cli.Context) error {
|
||||
// return send(c)
|
||||
// },
|
||||
// },
|
||||
// {
|
||||
// Name: "relay",
|
||||
// Usage: "start a croc relay",
|
||||
// Description: "the croc relay will handle websocket and TCP connections",
|
||||
// Flags: []cli.Flag{
|
||||
// cli.StringFlag{Name: "tcp", Value: "27130,27131,27132,27133", Usage: "ports for the tcp connections"},
|
||||
// cli.StringFlag{Name: "port", Value: "8130", Usage: "port that the websocket listens on"},
|
||||
// cli.StringFlag{Name: "curve", Value: "siec", Usage: "specify elliptic curve to use (p224, p256, p384, p521, siec)"},
|
||||
// },
|
||||
// HelpName: "croc relay",
|
||||
// Action: func(c *cli.Context) error {
|
||||
// return relay(c)
|
||||
// },
|
||||
// },
|
||||
// }
|
||||
// app.Flags = []cli.Flag{
|
||||
// cli.StringFlag{Name: "relay", Value: "wss://croc3.schollz.com"},
|
||||
// cli.BoolFlag{Name: "no-local", Usage: "disable local mode"},
|
||||
// cli.BoolFlag{Name: "local", Usage: "use only local mode"},
|
||||
// cli.BoolFlag{Name: "debug", Usage: "increase verbosity (a lot)"},
|
||||
// cli.BoolFlag{Name: "yes", Usage: "automatically agree to all prompts"},
|
||||
// cli.BoolFlag{Name: "stdout", Usage: "redirect file to stdout"},
|
||||
// }
|
||||
// app.EnableBashCompletion = true
|
||||
// app.HideHelp = false
|
||||
// app.HideVersion = false
|
||||
// app.BashComplete = func(c *cli.Context) {
|
||||
// fmt.Fprintf(c.App.Writer, "send\nreceive\relay")
|
||||
// }
|
||||
// app.Action = func(c *cli.Context) error {
|
||||
// return receive(c)
|
||||
// }
|
||||
// app.Before = func(c *cli.Context) error {
|
||||
// cr = croc.Init()
|
||||
// cr.AllowLocalDiscovery = true
|
||||
// cr.WebsocketAddress = c.GlobalString("relay")
|
||||
// cr.SetDebug(c.GlobalBool("debug"))
|
||||
// cr.Yes = c.GlobalBool("yes")
|
||||
// cr.Stdout = c.GlobalBool("stdout")
|
||||
// cr.LocalOnly = c.GlobalBool("local")
|
||||
// cr.NoLocal = c.GlobalBool("no-local")
|
||||
// return nil
|
||||
// }
|
||||
|
||||
// err := app.Run(os.Args)
|
||||
// if err != nil {
|
||||
// fmt.Printf("\nerror: %s", err.Error())
|
||||
// }
|
||||
// }
|
||||
|
||||
// func send(c *cli.Context) error {
|
||||
// stat, _ := os.Stdin.Stat()
|
||||
// var fname string
|
||||
// if (stat.Mode() & os.ModeCharDevice) == 0 {
|
||||
// fname = "stdin"
|
||||
// } else {
|
||||
// fname = c.Args().First()
|
||||
// }
|
||||
// if fname == "" {
|
||||
// return errors.New("must specify file: croc send [filename]")
|
||||
// }
|
||||
// cr.UseCompression = !c.Bool("no-compress")
|
||||
// cr.UseEncryption = !c.Bool("no-encrypt")
|
||||
// if c.String("code") != "" {
|
||||
// codePhrase = c.String("code")
|
||||
// }
|
||||
// return cr.Send(fname, codePhrase)
|
||||
// }
|
||||
|
||||
// func receive(c *cli.Context) error {
|
||||
// if c.GlobalString("code") != "" {
|
||||
// codePhrase = c.GlobalString("code")
|
||||
// }
|
||||
// if c.Args().First() != "" {
|
||||
// codePhrase = c.Args().First()
|
||||
// }
|
||||
// return cr.Receive(codePhrase)
|
||||
// }
|
||||
|
||||
// func relay(c *cli.Context) error {
|
||||
// cr.TcpPorts = strings.Split(c.String("tcp"), ",")
|
||||
// cr.ServerPort = c.String("port")
|
||||
// cr.CurveType = c.String("curve")
|
||||
// return cr.Relay()
|
||||
// }
|
||||
func relay(c *cli.Context) error {
|
||||
cr.ServerPort = c.String("port")
|
||||
cr.CurveType = c.String("curve")
|
||||
return cr.Relay()
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue