Compare commits
No commits in common. "main" and "v0.0.4" have entirely different histories.
3
.gitignore
vendored
3
.gitignore
vendored
@ -1,3 +0,0 @@
|
||||
.DS_Store
|
||||
dist/
|
||||
release/
|
||||
@ -1,50 +0,0 @@
|
||||
version: 2
|
||||
|
||||
before:
|
||||
hooks:
|
||||
- go mod tidy
|
||||
- go test ./...
|
||||
|
||||
builds:
|
||||
- env:
|
||||
- CGO_ENABLED=0
|
||||
goos:
|
||||
- linux
|
||||
- windows
|
||||
- darwin
|
||||
- freebsd
|
||||
goarch:
|
||||
- arm
|
||||
- arm64
|
||||
- amd64
|
||||
goarm:
|
||||
- 6
|
||||
- 7
|
||||
ignore:
|
||||
- goos: darwin
|
||||
goarch: arm
|
||||
- goos: windows
|
||||
goarch: arm
|
||||
- goos: windows
|
||||
goarch: arm64
|
||||
- goos: freebsd
|
||||
goarch: arm
|
||||
|
||||
|
||||
archives:
|
||||
- formats: [tar.gz]
|
||||
# this name template makes the OS and Arch compatible with the results of `uname`.
|
||||
name_template: >-
|
||||
{{ .ProjectName }}_
|
||||
{{- title .Os }}_
|
||||
{{- if eq .Arch "amd64" }}x86_64
|
||||
{{- else if eq .Arch "386" }}i386
|
||||
{{- else }}{{ .Arch }}{{ end }}
|
||||
{{- if .Arm }}v{{ .Arm }}{{ end }}
|
||||
# use zip for windows archives
|
||||
format_overrides:
|
||||
- goos: windows
|
||||
formats: [zip]
|
||||
|
||||
changelog:
|
||||
disable: true
|
||||
13
.vscode/settings.json
vendored
13
.vscode/settings.json
vendored
@ -1,20 +1,9 @@
|
||||
{
|
||||
"cSpell.words": [
|
||||
"authtoken",
|
||||
"Debugf",
|
||||
"Infof",
|
||||
"isatty",
|
||||
"netgiv",
|
||||
"ngfs",
|
||||
"tardisx",
|
||||
"ttys"
|
||||
],
|
||||
"cSpell.ignoreWords": [
|
||||
"logrus",
|
||||
"mattn",
|
||||
"pflag",
|
||||
"sigchan",
|
||||
"sirupsen",
|
||||
"verysecretvaluehere"
|
||||
"pflag"
|
||||
]
|
||||
}
|
||||
42
CHANGELOG.md
42
CHANGELOG.md
@ -1,42 +0,0 @@
|
||||
# Changelog
|
||||
|
||||
All notable changes to this project will be documented in this file.
|
||||
|
||||
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
|
||||
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
||||
|
||||
## v1.0.0 - 2025-04-26
|
||||
|
||||
### Added
|
||||
|
||||
* burn mode - remove copied files from the server (by [@jsnfwlr](https://github.com/jsnfwlr))
|
||||
|
||||
## v0.0.5 - 2025-04-26
|
||||
|
||||
### Changed
|
||||
|
||||
* minor refactoring
|
||||
* start using goreleaser
|
||||
|
||||
## v0.0.4 - 2022-01-26
|
||||
|
||||
### Added
|
||||
|
||||
* timestamps on list output
|
||||
|
||||
## v0.0.3 - 2022-01-25
|
||||
|
||||
### Added
|
||||
|
||||
* get authtoken from the terminal if not available elsewhere
|
||||
|
||||
## v0.0.2 - 2022-01-17
|
||||
|
||||
### Added
|
||||
|
||||
* add -p to paste from a file instead of stdin
|
||||
|
||||
## v0.0.1 - 2022-01-16
|
||||
|
||||
Initial version
|
||||
|
||||
33
README.md
33
README.md
@ -18,9 +18,6 @@ pipe) modes, allowing intuitive use like:
|
||||
Note that since netgiv uses a persistent server, there is no need to setup both ends
|
||||
of the pipeline in advance (compared to netcat or similar tools).
|
||||
|
||||
This also means that you could "copy" once and "paste" multiple times, on
|
||||
multiple different machines.
|
||||
|
||||
All data is encrypted in flight (though not in the temporary files on the server)
|
||||
Access to the server is granted by an authentication token (preshared key) of your
|
||||
choice.
|
||||
@ -32,6 +29,10 @@ choice.
|
||||
Grab the appropriate version from https://github.com/tardisx/netgiv/releases, unzip
|
||||
and place the binary somewhere on your $PATH.
|
||||
|
||||
Copy and paste for the trusting & lazy:
|
||||
|
||||
curl -L https://github.com/tardisx/netgiv/releases/download/v0.0.3/netgiv-linux-v0.0.3.zip | funzip > netgiv && chmod a+x netgiv
|
||||
|
||||
### Compiling from source
|
||||
|
||||
go install github.com/tardisx/netgiv@latest
|
||||
@ -62,19 +63,12 @@ set.
|
||||
|
||||
## Running
|
||||
|
||||
|
||||
### Server
|
||||
|
||||
To run a server, just run:
|
||||
|
||||
netgiv --server
|
||||
|
||||
`netgiv` will run in the foreground and log accesses to it.
|
||||
|
||||
### Client
|
||||
|
||||
#### Copy
|
||||
|
||||
On any client, run:
|
||||
|
||||
$ echo "Hello" | netgiv
|
||||
@ -85,8 +79,6 @@ To check for success, try:
|
||||
|
||||
You should see "hello" echoed on your terminal.
|
||||
|
||||
#### List
|
||||
|
||||
To check the list of files on the server:
|
||||
|
||||
$ netgiv -l
|
||||
@ -97,8 +89,6 @@ To check the list of files on the server:
|
||||
|
||||
Note that netgiv tries to identify each file based on file magic heuristics.
|
||||
|
||||
#### Paste
|
||||
|
||||
If you would like to fetch (paste) a particular file:
|
||||
|
||||
netgiv -p 3 > file.mov
|
||||
@ -108,14 +98,6 @@ Where '3' comes from the information provided in the `-l` output.
|
||||
Note that providing no `-p` option is the same as `-p X` where X is the highest
|
||||
numbered upload (most recent).
|
||||
|
||||
#### Burn
|
||||
|
||||
If you would like to remove/delete (burn) a particular file:
|
||||
|
||||
netgiv -b 3
|
||||
|
||||
Where '3' comes from the information provided in the `-l` output.
|
||||
|
||||
### Notes on output
|
||||
|
||||
Since netgiv is designed to be used in a pipeline, it does not provide any
|
||||
@ -147,10 +129,8 @@ to the client - the server must have a config file with an authtoken specified.
|
||||
|
||||
## Temporary file storage
|
||||
|
||||
The `netgiv` server will store files in your normal system temporary dir. These files
|
||||
are *not* encrypted. They will be deleted when the server shuts down (SIGTERM). If you
|
||||
want or need to remove the files before the server shuts down, you can use the
|
||||
[burn](#burn) flag.
|
||||
The `netgiv` server will store files in your normal system temporary dir. They will
|
||||
be deleted when the server shuts down (SIGTERM). These files are *not* encrypted.
|
||||
|
||||
## Window support
|
||||
|
||||
@ -160,4 +140,3 @@ pipes. Bug reports and suggestions for workarounds are welcome.
|
||||
# Acknowledgements
|
||||
|
||||
* thanks to tengig for the name
|
||||
* thanks to [@jsnfwlr](https://github.com/jsnfwlr) for the burn feature
|
||||
|
||||
40
build_release.pl
Executable file
40
build_release.pl
Executable file
@ -0,0 +1,40 @@
|
||||
#!/usr/bin/env perl
|
||||
|
||||
use strict;
|
||||
use warnings;
|
||||
|
||||
open my $fh, "<", "main.go" || die $!;
|
||||
|
||||
my $version;
|
||||
while (<$fh>) {
|
||||
# CurrentVersion: "v0.04"
|
||||
$version = $1 if /CurrentVersion\s*=\s*"(v[\d\.]+)"/;
|
||||
}
|
||||
close $fh;
|
||||
|
||||
die "no version?" unless defined $version;
|
||||
|
||||
# quit if tests fail
|
||||
system("go test ./...") && die "not building release with failing tests";
|
||||
|
||||
# so lazy
|
||||
system "rm", "-rf", "release", "dist";
|
||||
system "mkdir", "release";
|
||||
system "mkdir", "dist";
|
||||
|
||||
my %build = (
|
||||
win => { env => { GOOS => 'windows', GOARCH => 'amd64' }, filename => 'netgiv.exe' },
|
||||
linux => { env => { GOOS => 'linux', GOARCH => 'amd64' }, filename => 'netgiv' },
|
||||
mac => { env => { GOOS => 'darwin', GOARCH => 'amd64' }, filename => 'netgiv' },
|
||||
);
|
||||
|
||||
foreach my $type (keys %build) {
|
||||
mkdir "release/$type";
|
||||
}
|
||||
|
||||
foreach my $type (keys %build) {
|
||||
local $ENV{GOOS} = $build{$type}->{env}->{GOOS};
|
||||
local $ENV{GOARCH} = $build{$type}->{env}->{GOARCH};
|
||||
system "go", "build", "-o", "release/$type/" . $build{$type}->{filename};
|
||||
system "zip", "-j", "dist/netgiv-$type-$version.zip", ( glob "release/$type/*" );
|
||||
}
|
||||
51
client.go
51
client.go
@ -22,7 +22,6 @@ type Client struct {
|
||||
port int
|
||||
list bool
|
||||
send bool
|
||||
burnNum int
|
||||
receiveNum int
|
||||
authToken string
|
||||
}
|
||||
@ -51,8 +50,7 @@ func (c *Client) Connect() error {
|
||||
enc := gob.NewEncoder(&secureConnection)
|
||||
dec := gob.NewDecoder(&secureConnection)
|
||||
|
||||
switch {
|
||||
case c.list:
|
||||
if c.list {
|
||||
log.Debugf("requesting file list")
|
||||
|
||||
err := c.connectToServer(secure.OperationTypeList, enc, dec)
|
||||
@ -77,7 +75,8 @@ func (c *Client) Connect() error {
|
||||
fmt.Printf("total: %d files\n", numFiles)
|
||||
conn.Close()
|
||||
log.Debugf("done listing")
|
||||
case c.receiveNum >= 0:
|
||||
|
||||
} else if c.receiveNum >= 0 {
|
||||
log.Debugf("receiving file %d", c.receiveNum)
|
||||
|
||||
err := c.connectToServer(secure.OperationTypeReceive, enc, dec)
|
||||
@ -99,8 +98,7 @@ func (c *Client) Connect() error {
|
||||
panic(err)
|
||||
}
|
||||
|
||||
switch res.Status {
|
||||
case secure.ReceiveDataStartResponseOK:
|
||||
if res.Status == secure.ReceiveDataStartResponseOK {
|
||||
for {
|
||||
res := secure.PacketReceiveDataNext{}
|
||||
err = dec.Decode(&res)
|
||||
@ -113,14 +111,14 @@ func (c *Client) Connect() error {
|
||||
}
|
||||
}
|
||||
log.Debugf("finished")
|
||||
case secure.ReceiveDataStartResponseNotFound:
|
||||
} else if res.Status == secure.ReceiveDataStartResponseNotFound {
|
||||
log.Error("ngf not found")
|
||||
default:
|
||||
} else {
|
||||
panic("unknown status")
|
||||
}
|
||||
|
||||
conn.Close()
|
||||
case c.send:
|
||||
} else if c.send {
|
||||
// send mode
|
||||
|
||||
err := c.connectToServer(secure.OperationTypeSend, enc, dec)
|
||||
@ -171,45 +169,16 @@ func (c *Client) Connect() error {
|
||||
log.Debugf("Sent %s in %d chunks", humanize.Bytes(uint64(nBytes)), nChunks)
|
||||
|
||||
conn.Close()
|
||||
case c.burnNum >= 0:
|
||||
log.Debugf("burning file %d", c.burnNum)
|
||||
|
||||
err := c.connectToServer(secure.OperationTypeBurn, enc, dec)
|
||||
if err != nil {
|
||||
return fmt.Errorf("could not connect and auth: %v", err)
|
||||
}
|
||||
|
||||
req := secure.PacketBurnRequest{
|
||||
Id: uint32(c.burnNum),
|
||||
}
|
||||
err = enc.Encode(req)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
// expect a response telling us if we can go ahead
|
||||
res := secure.PacketBurnResponse{}
|
||||
err = dec.Decode(&res)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
|
||||
switch res.Status {
|
||||
case secure.BurnResponseOK:
|
||||
log.Debugf("finished")
|
||||
case secure.BurnResponseNotFound:
|
||||
log.Error("ngf not found")
|
||||
default:
|
||||
panic("unknown status")
|
||||
}
|
||||
|
||||
conn.Close()
|
||||
default:
|
||||
} else {
|
||||
panic("no client mode set")
|
||||
}
|
||||
return nil
|
||||
|
||||
}
|
||||
|
||||
func (c *Client) connectToServer(op secure.OperationTypeEnum, enc *gob.Encoder, dec *gob.Decoder) error {
|
||||
|
||||
// list mode
|
||||
startPacket := secure.PacketStartRequest{
|
||||
OperationType: op,
|
||||
|
||||
85
main.go
85
main.go
@ -13,37 +13,41 @@ import (
|
||||
"github.com/spf13/viper"
|
||||
)
|
||||
|
||||
var CurrentVersion = "v0.0.4"
|
||||
|
||||
const ProtocolVersion = "1.1"
|
||||
|
||||
type ListValue struct {
|
||||
Required bool
|
||||
Number uint
|
||||
type PasteValue struct {
|
||||
PasteRequired bool
|
||||
PasteNumber uint
|
||||
}
|
||||
|
||||
func (v *ListValue) String() string {
|
||||
if v.Required {
|
||||
return fmt.Sprintf("YES: %d", v.Number)
|
||||
func (v *PasteValue) String() string {
|
||||
if v.PasteRequired {
|
||||
return fmt.Sprintf("YES: %d", v.PasteNumber)
|
||||
}
|
||||
return "0"
|
||||
}
|
||||
|
||||
func (v *ListValue) Set(s string) error {
|
||||
v.Required = true
|
||||
func (v *PasteValue) Set(s string) error {
|
||||
v.PasteRequired = true
|
||||
num, err := strconv.ParseUint(s, 10, 64)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
v.Number = uint(num)
|
||||
v.PasteNumber = uint(num)
|
||||
return nil
|
||||
}
|
||||
|
||||
func (v *ListValue) Type() string {
|
||||
func (v *PasteValue) Type() string {
|
||||
return "int"
|
||||
|
||||
}
|
||||
|
||||
func getAuthTokenFromTerminal() string {
|
||||
tty, err := os.OpenFile("/dev/tty", os.O_RDWR, 0o755)
|
||||
tty, err := os.OpenFile("/dev/tty", os.O_RDWR, 0755)
|
||||
|
||||
if err != nil {
|
||||
log.Printf("cannot open /dev/tty to read authtoken: %v", err)
|
||||
return ""
|
||||
@ -55,9 +59,7 @@ func getAuthTokenFromTerminal() string {
|
||||
log.Printf("cannot set /dev/tty to raw mode: %v", err)
|
||||
return ""
|
||||
}
|
||||
defer func() {
|
||||
_ = term.Restore(fd, oldState)
|
||||
}()
|
||||
defer term.Restore(fd, oldState)
|
||||
|
||||
t := term.NewTerminal(tty, "")
|
||||
pass, err := t.ReadPassword("Enter auth token: ")
|
||||
@ -69,27 +71,17 @@ func getAuthTokenFromTerminal() string {
|
||||
return pass
|
||||
}
|
||||
|
||||
var (
|
||||
version = "dev"
|
||||
commit = "none"
|
||||
date = "unknown"
|
||||
)
|
||||
|
||||
func main() {
|
||||
isServer := flag.Bool("server", false, "Run netgiv in server mode")
|
||||
|
||||
// client mode flags
|
||||
isList := flag.BoolP("list", "l", false, "Returns a list of current items on the server")
|
||||
isSend := flag.BoolP("copy", "c", false, "send stdin to netgiv server (copy)")
|
||||
isSend := flag.BoolP("copy", "c", false, "sending stdin to netgiv server (copy)")
|
||||
|
||||
pasteFlag := ListValue{}
|
||||
flag.VarP(&pasteFlag, "paste", "p", "receive from netgiv server to stdout (paste), with optional id (see --list)")
|
||||
pasteFlag := PasteValue{}
|
||||
flag.VarP(&pasteFlag, "paste", "p", "receive from netgiv server to stdout (paste), with optional number (see --list)")
|
||||
flag.Lookup("paste").NoOptDefVal = "0"
|
||||
|
||||
burnFlag := ListValue{}
|
||||
flag.VarP(&burnFlag, "burn", "b", "burn (remove/delete) the item on the netgiv server, with optional id (see --list)")
|
||||
flag.Lookup("burn").NoOptDefVal = "0"
|
||||
|
||||
debug := flag.Bool("debug", false, "turn on debug logging")
|
||||
flag.String("address", "", "IP address/hostname of the netgiv server")
|
||||
|
||||
@ -99,27 +91,14 @@ func main() {
|
||||
flag.String("authtoken", "", "Authentication token")
|
||||
flag.Int("port", 0, "Port")
|
||||
|
||||
versionFlag := flag.BoolP("version", "v", false, "show version and exit")
|
||||
|
||||
flag.Parse()
|
||||
|
||||
if versionFlag != nil && *versionFlag {
|
||||
fmt.Print(versionInfo(true))
|
||||
os.Exit(0)
|
||||
}
|
||||
|
||||
receiveNum := int(pasteFlag.Number)
|
||||
if !pasteFlag.Required {
|
||||
receiveNum := int(pasteFlag.PasteNumber)
|
||||
if !pasteFlag.PasteRequired {
|
||||
receiveNum = -1
|
||||
}
|
||||
|
||||
burnNum := int(burnFlag.Number)
|
||||
if !burnFlag.Required {
|
||||
burnNum = -1
|
||||
}
|
||||
|
||||
viper.AddConfigPath("$HOME/.netgiv/")
|
||||
viper.AddConfigPath("$HOME/.config/netgiv/") // calling multiple times adds to search paths
|
||||
viper.AddConfigPath("$HOME/.netgiv/") // call multiple times to add many search paths
|
||||
viper.SetConfigType("yaml")
|
||||
|
||||
viper.SetDefault("port", 4512)
|
||||
@ -133,10 +112,11 @@ func main() {
|
||||
}
|
||||
}
|
||||
|
||||
_ = viper.BindPFlags(flag.CommandLine)
|
||||
flag.Parse()
|
||||
viper.BindPFlags(flag.CommandLine)
|
||||
|
||||
viper.SetEnvPrefix("NETGIV")
|
||||
_ = viper.BindEnv("authtoken")
|
||||
viper.BindEnv("authtoken")
|
||||
|
||||
// pull the various things into local variables
|
||||
port := viper.GetInt("port") // retrieve value from viper
|
||||
@ -190,12 +170,11 @@ environment variable. This may be preferable in some environments.
|
||||
log.Fatal("an address must be provided on the command line, or configuration")
|
||||
}
|
||||
|
||||
log.Debugf("protocol version: %s", ProtocolVersion)
|
||||
if *isServer {
|
||||
s := Server{port: port, authToken: authtoken}
|
||||
s.Run()
|
||||
} else {
|
||||
if !*isList && !*isSend && burnNum == -1 && receiveNum == -1 {
|
||||
if !*isList && !*isSend && receiveNum == -1 {
|
||||
// try to work out the intent based on whether or not stdin/stdout
|
||||
// are ttys
|
||||
stdinTTY := isatty.IsTerminal(os.Stdin.Fd())
|
||||
@ -214,20 +193,10 @@ environment variable. This may be preferable in some environments.
|
||||
|
||||
}
|
||||
|
||||
c := Client{port: port, address: address, list: *isList, send: *isSend, burnNum: burnNum, receiveNum: receiveNum, authToken: authtoken}
|
||||
c := Client{port: port, address: address, list: *isList, send: *isSend, receiveNum: receiveNum, authToken: authtoken}
|
||||
err := c.Connect()
|
||||
if err != nil {
|
||||
fmt.Print(err)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func versionInfo(verbose bool) string {
|
||||
out := ""
|
||||
out += fmt.Sprintf("netgiv %s, built at %s\n", version, date)
|
||||
if verbose {
|
||||
out += fmt.Sprintf("commit: %s\n", commit)
|
||||
out += fmt.Sprintf("http://github.com/tardisx/netgiv\n")
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
@ -129,7 +129,7 @@ func (s *SecureConnection) Write(p []byte) (int, error) {
|
||||
var nonce [24]byte
|
||||
|
||||
// Create a new nonce for each message sent
|
||||
_, _ = rand.Read(nonce[:])
|
||||
rand.Read(nonce[:])
|
||||
|
||||
encryptedMessage := box.SealAfterPrecomputation(nil, p, &nonce, s.SharedKey)
|
||||
sm := SecureMessage{Msg: encryptedMessage, Nonce: nonce}
|
||||
@ -145,10 +145,10 @@ func Handshake(conn *net.TCPConn) *[32]byte {
|
||||
|
||||
publicKey, privateKey, _ := box.GenerateKey(rand.Reader)
|
||||
|
||||
_, _ = conn.Write(publicKey[:])
|
||||
conn.Write(publicKey[:])
|
||||
|
||||
peerKeyArray := make([]byte, 32)
|
||||
_, _ = conn.Read(peerKeyArray)
|
||||
conn.Read(peerKeyArray)
|
||||
copy(peerKey[:], peerKeyArray)
|
||||
|
||||
box.Precompute(&sharedKey, &peerKey, privateKey)
|
||||
@ -162,11 +162,10 @@ const (
|
||||
OperationTypeSend OperationTypeEnum = iota
|
||||
OperationTypeList
|
||||
OperationTypeReceive
|
||||
OperationTypeBurn
|
||||
)
|
||||
|
||||
// PacketStartRequest is sent from the client to the server at the beginning
|
||||
// to authenticate and announce the requested particular operation
|
||||
// to authenticate and annonce the requested particular operation
|
||||
type PacketStartRequest struct {
|
||||
OperationType OperationTypeEnum
|
||||
ClientName string
|
||||
@ -234,20 +233,3 @@ type PacketListData struct {
|
||||
Timestamp time.Time
|
||||
Kind string
|
||||
}
|
||||
|
||||
type PacketBurnRequest struct {
|
||||
Id uint32
|
||||
}
|
||||
|
||||
type PacketBurnResponse struct {
|
||||
Status PacketBurnResponseEnum
|
||||
}
|
||||
|
||||
type PacketBurnResponseEnum byte
|
||||
|
||||
const (
|
||||
// File has been deleted
|
||||
BurnResponseOK PacketBurnResponseEnum = iota
|
||||
// No such file by index
|
||||
BurnResponseNotFound
|
||||
)
|
||||
|
||||
@ -13,8 +13,7 @@ func TestBasic(t *testing.T) {
|
||||
|
||||
srcSecConn := SecureConnection{
|
||||
Conn: srcConn,
|
||||
SharedKey: &[32]byte{
|
||||
0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7,
|
||||
SharedKey: &[32]byte{0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7,
|
||||
0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7,
|
||||
0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7,
|
||||
0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7,
|
||||
@ -24,8 +23,7 @@ func TestBasic(t *testing.T) {
|
||||
|
||||
dstSecConn := SecureConnection{
|
||||
Conn: dstConn,
|
||||
SharedKey: &[32]byte{
|
||||
0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7,
|
||||
SharedKey: &[32]byte{0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7,
|
||||
0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7,
|
||||
0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7,
|
||||
0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7,
|
||||
@ -47,7 +45,7 @@ func TestBasic(t *testing.T) {
|
||||
for _, b := range testData {
|
||||
|
||||
go func() {
|
||||
_, _ = srcSecConn.Write(b)
|
||||
srcSecConn.Write(b)
|
||||
}()
|
||||
|
||||
time.Sleep(time.Second)
|
||||
@ -72,8 +70,7 @@ func TestPacketBasic(t *testing.T) {
|
||||
|
||||
srcSecConn := SecureConnection{
|
||||
Conn: srcConn,
|
||||
SharedKey: &[32]byte{
|
||||
0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7,
|
||||
SharedKey: &[32]byte{0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7,
|
||||
0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7,
|
||||
0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7,
|
||||
0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7,
|
||||
@ -83,8 +80,7 @@ func TestPacketBasic(t *testing.T) {
|
||||
|
||||
dstSecConn := SecureConnection{
|
||||
Conn: dstConn,
|
||||
SharedKey: &[32]byte{
|
||||
0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7,
|
||||
SharedKey: &[32]byte{0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7,
|
||||
0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7,
|
||||
0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7,
|
||||
0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7,
|
||||
@ -101,12 +97,10 @@ func TestPacketBasic(t *testing.T) {
|
||||
ProtocolVersion: "1.1",
|
||||
AuthToken: "abc123",
|
||||
}
|
||||
go func() {
|
||||
_ = enc.Encode(packet)
|
||||
}()
|
||||
go func() { enc.Encode(packet) }()
|
||||
|
||||
recvPacket := PacketStartRequest{}
|
||||
_ = dec.Decode(&recvPacket)
|
||||
dec.Decode(&recvPacket)
|
||||
|
||||
if recvPacket.OperationType != OperationTypeReceive {
|
||||
t.Error("bad OperationType")
|
||||
@ -123,6 +117,7 @@ func TestPacketBasic(t *testing.T) {
|
||||
if recvPacket.ProtocolVersion != "1.1" {
|
||||
t.Error("bad ProtocolVersion")
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
func BenchmarkPPS(b *testing.B) {
|
||||
@ -130,8 +125,7 @@ func BenchmarkPPS(b *testing.B) {
|
||||
|
||||
srcSecConn := SecureConnection{
|
||||
Conn: srcConn,
|
||||
SharedKey: &[32]byte{
|
||||
0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7,
|
||||
SharedKey: &[32]byte{0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7,
|
||||
0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7,
|
||||
0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7,
|
||||
0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7,
|
||||
@ -141,8 +135,7 @@ func BenchmarkPPS(b *testing.B) {
|
||||
|
||||
dstSecConn := SecureConnection{
|
||||
Conn: dstConn,
|
||||
SharedKey: &[32]byte{
|
||||
0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7,
|
||||
SharedKey: &[32]byte{0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7,
|
||||
0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7,
|
||||
0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7,
|
||||
0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7,
|
||||
@ -160,11 +153,12 @@ func BenchmarkPPS(b *testing.B) {
|
||||
for i := 0; i < b.N; i++ {
|
||||
|
||||
go func() {
|
||||
_, _ = srcSecConn.Write(testdata)
|
||||
srcSecConn.Write(testdata)
|
||||
}()
|
||||
|
||||
out := make([]byte, 16384)
|
||||
n, err := dstSecConn.Read(out)
|
||||
|
||||
if err != nil {
|
||||
b.Errorf("got error %v", err)
|
||||
}
|
||||
@ -175,4 +169,5 @@ func BenchmarkPPS(b *testing.B) {
|
||||
b.Errorf("%v not equal to %v", out[:n], testdata)
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
108
server.go
108
server.go
@ -34,15 +34,10 @@ type NGF struct {
|
||||
Timestamp time.Time
|
||||
}
|
||||
|
||||
func (ngf NGF) String() string {
|
||||
return fmt.Sprintf("id: %d, stored: %s, size: %d, kind: %s", ngf.Id, ngf.StorePath, ngf.Size, ngf.Kind)
|
||||
}
|
||||
|
||||
var ngfs []NGF
|
||||
var globalId uint32
|
||||
|
||||
func (s *Server) Run() {
|
||||
log.Info(versionInfo(false))
|
||||
log.Infof("starting server on :%d", s.port)
|
||||
address := fmt.Sprintf(":%d", s.port)
|
||||
networkAddress, _ := net.ResolveTCPAddr("tcp", address)
|
||||
@ -63,7 +58,7 @@ func (s *Server) Run() {
|
||||
log.Printf("removing file: %s", ngf.StorePath)
|
||||
err := os.Remove(ngf.StorePath)
|
||||
if err != nil {
|
||||
log.Errorf("could not remove %s: %v", ngf.StorePath, err)
|
||||
log.Printf("could not remove %s: %v", ngf.StorePath, err)
|
||||
}
|
||||
}
|
||||
os.Exit(0)
|
||||
@ -73,6 +68,7 @@ func (s *Server) Run() {
|
||||
|
||||
for {
|
||||
conn, err := listener.AcceptTCP()
|
||||
|
||||
if err != nil {
|
||||
fmt.Print(err)
|
||||
}
|
||||
@ -84,7 +80,7 @@ func (s *Server) Run() {
|
||||
func (s *Server) handleConnection(conn *net.TCPConn) {
|
||||
defer conn.Close()
|
||||
|
||||
_ = conn.SetDeadline(time.Now().Add(time.Second * 5))
|
||||
conn.SetDeadline(time.Now().Add(time.Second * 5))
|
||||
|
||||
sharedKey := secure.Handshake(conn)
|
||||
secureConnection := secure.SecureConnection{Conn: conn, SharedKey: sharedKey, Buffer: &bytes.Buffer{}}
|
||||
@ -115,25 +111,24 @@ func (s *Server) handleConnection(conn *net.TCPConn) {
|
||||
if start.ProtocolVersion != ProtocolVersion {
|
||||
log.Errorf("bad protocol version")
|
||||
startResponse.Response = secure.PacketStartResponseEnumWrongProtocol
|
||||
_ = enc.Encode(startResponse)
|
||||
enc.Encode(startResponse)
|
||||
return
|
||||
}
|
||||
|
||||
if start.AuthToken != s.authToken {
|
||||
log.Errorf("bad authtoken")
|
||||
startResponse.Response = secure.PacketStartResponseEnumBadAuthToken
|
||||
_ = enc.Encode(startResponse)
|
||||
enc.Encode(startResponse)
|
||||
return
|
||||
}
|
||||
|
||||
// otherwise we are good to continue, tell the client that
|
||||
startResponse.Response = secure.PacketStartResponseEnumOK
|
||||
_ = enc.Encode(startResponse)
|
||||
enc.Encode(startResponse)
|
||||
|
||||
_ = conn.SetDeadline(time.Now().Add(time.Second * 5))
|
||||
conn.SetDeadline(time.Now().Add(time.Second * 5))
|
||||
|
||||
switch start.OperationType {
|
||||
case secure.OperationTypeSend:
|
||||
if start.OperationType == secure.OperationTypeSend {
|
||||
log.Debugf("file incoming")
|
||||
|
||||
sendStart := secure.PacketSendDataStart{}
|
||||
@ -165,7 +160,7 @@ func (s *Server) handleConnection(conn *net.TCPConn) {
|
||||
sendData := secure.PacketSendDataNext{}
|
||||
determinedKind := false
|
||||
for {
|
||||
_ = conn.SetDeadline(time.Now().Add(time.Second * 5))
|
||||
conn.SetDeadline(time.Now().Add(time.Second * 5))
|
||||
err = dec.Decode(&sendData)
|
||||
if err == io.EOF {
|
||||
break
|
||||
@ -195,7 +190,7 @@ func (s *Server) handleConnection(conn *net.TCPConn) {
|
||||
determinedKind = true
|
||||
}
|
||||
|
||||
_, _ = file.Write(sendData.Data)
|
||||
file.Write(sendData.Data)
|
||||
}
|
||||
info, err := file.Stat()
|
||||
if err != nil {
|
||||
@ -209,13 +204,13 @@ func (s *Server) handleConnection(conn *net.TCPConn) {
|
||||
log.Printf("done receiving file: %v", ngf)
|
||||
|
||||
return
|
||||
case secure.OperationTypeReceive:
|
||||
} else if start.OperationType == secure.OperationTypeReceive {
|
||||
log.Printf("client requesting file receive")
|
||||
// wait for them to send the request
|
||||
req := secure.PacketReceiveDataStartRequest{}
|
||||
err := dec.Decode(&req)
|
||||
if err != nil {
|
||||
log.Errorf("error expecting PacketReceiveDataStartRequest: %v", err)
|
||||
log.Printf("error expecting PacketReceiveDataStartRequest: %v", err)
|
||||
return
|
||||
}
|
||||
|
||||
@ -247,7 +242,7 @@ func (s *Server) handleConnection(conn *net.TCPConn) {
|
||||
}
|
||||
err = enc.Encode(res)
|
||||
if err != nil {
|
||||
log.Errorf("could not send NotFound: %v", err)
|
||||
log.Printf("could not send NotFound: %v", err)
|
||||
}
|
||||
|
||||
return
|
||||
@ -302,7 +297,8 @@ func (s *Server) handleConnection(conn *net.TCPConn) {
|
||||
}
|
||||
log.Printf("sending done")
|
||||
return
|
||||
case secure.OperationTypeList:
|
||||
|
||||
} else if start.OperationType == secure.OperationTypeList {
|
||||
log.Debugf("client requesting file list")
|
||||
|
||||
for _, ngf := range ngfs {
|
||||
@ -312,83 +308,15 @@ func (s *Server) handleConnection(conn *net.TCPConn) {
|
||||
p.Id = ngf.Id
|
||||
p.Filename = ngf.Filename
|
||||
p.Timestamp = ngf.Timestamp
|
||||
_ = enc.Encode(p)
|
||||
enc.Encode(p)
|
||||
}
|
||||
log.Debugf("done sending list, closing connection")
|
||||
|
||||
return
|
||||
case secure.OperationTypeBurn:
|
||||
log.Debugf("client requesting burn")
|
||||
// wait for them to send the request
|
||||
req := secure.PacketBurnRequest{}
|
||||
err := dec.Decode(&req)
|
||||
if err != nil {
|
||||
log.Errorf("error expecting PacketBurnRequest: %v", err)
|
||||
return
|
||||
}
|
||||
|
||||
log.Debugf("The client asked for %v to be burned", req)
|
||||
|
||||
// do we have this ngf by id?
|
||||
var requestedNGF NGF
|
||||
|
||||
if len(ngfs) > 0 {
|
||||
if req.Id == 0 {
|
||||
// they want the most recent one
|
||||
requestedNGF = ngfs[len(ngfs)-1]
|
||||
} else {
|
||||
for _, ngf := range ngfs {
|
||||
if ngf.Id == req.Id {
|
||||
requestedNGF = ngf
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
log.Debugf("going to burn %v", requestedNGF)
|
||||
|
||||
if requestedNGF.Id == 0 {
|
||||
// not found
|
||||
log.Errorf("user requested burning %d, not found", req.Id)
|
||||
res := secure.PacketBurnResponse{
|
||||
Status: secure.BurnResponseNotFound,
|
||||
}
|
||||
err = enc.Encode(res)
|
||||
if err != nil {
|
||||
log.Errorf("could not send NotFound: %v", err)
|
||||
}
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
// remove the file
|
||||
err = os.Remove(requestedNGF.StorePath)
|
||||
if err != nil {
|
||||
log.Errorf("could not remove file %s: %v", requestedNGF.StorePath, err)
|
||||
return
|
||||
}
|
||||
|
||||
// remove the ngf from the list
|
||||
for i, ngf := range ngfs {
|
||||
if ngf.Id == requestedNGF.Id {
|
||||
ngfs = append(ngfs[:i], ngfs[i+1:]...)
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
res := secure.PacketBurnResponse{
|
||||
Status: secure.BurnResponseOK,
|
||||
}
|
||||
err = enc.Encode(res)
|
||||
if err != nil {
|
||||
log.Errorf("error sending PacketBurnResponse: %v", err)
|
||||
return
|
||||
}
|
||||
|
||||
log.Printf("burn complete")
|
||||
return
|
||||
default:
|
||||
} else {
|
||||
log.Errorf("bad operation")
|
||||
return
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user