-
Notifications
You must be signed in to change notification settings - Fork 45
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #278 from Darkren/feature/vpn
VPN apps Former-commit-id: 2b52938
- Loading branch information
Showing
155 changed files
with
4,459 additions
and
485 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
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,118 @@ | ||
| package main | ||
|
|
||
| import ( | ||
| "context" | ||
| "flag" | ||
| "fmt" | ||
| "net" | ||
| "os" | ||
| "os/signal" | ||
| "syscall" | ||
| "time" | ||
|
|
||
| "github.com/SkycoinProject/dmsg/cipher" | ||
| "github.com/SkycoinProject/dmsg/netutil" | ||
| "github.com/SkycoinProject/skycoin/src/util/logging" | ||
|
|
||
| "github.com/SkycoinProject/skywire-mainnet/internal/vpn" | ||
| "github.com/SkycoinProject/skywire-mainnet/pkg/app" | ||
| "github.com/SkycoinProject/skywire-mainnet/pkg/app/appnet" | ||
| "github.com/SkycoinProject/skywire-mainnet/pkg/routing" | ||
| "github.com/SkycoinProject/skywire-mainnet/pkg/skyenv" | ||
| ) | ||
|
|
||
| const ( | ||
| appName = skyenv.VPNClientName | ||
| netType = appnet.TypeSkynet | ||
| vpnPort = routing.Port(skyenv.VPNServerPort) | ||
| ) | ||
|
|
||
| const ( | ||
| serverDialInitBO = 1 * time.Second | ||
| serverDialMaxBO = 10 * time.Second | ||
| ) | ||
|
|
||
| var ( | ||
| log = app.NewLogger(appName) | ||
| r = netutil.NewRetrier(log, serverDialInitBO, serverDialMaxBO, 0, 1) | ||
| ) | ||
|
|
||
| var serverPKStr = flag.String("srv", "", "PubKey of the server to connect to") | ||
|
|
||
| func dialServer(appCl *app.Client, pk cipher.PubKey) (net.Conn, error) { | ||
| var conn net.Conn | ||
| err := r.Do(context.Background(), func() error { | ||
| var err error | ||
| conn, err = appCl.Dial(appnet.Addr{ | ||
| Net: netType, | ||
| PubKey: pk, | ||
| Port: vpnPort, | ||
| }) | ||
| return err | ||
| }) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| return conn, nil | ||
| } | ||
|
|
||
| func main() { | ||
| flag.Parse() | ||
|
|
||
| if *serverPKStr == "" { | ||
| log.Fatalln("VPN server pub key is missing") | ||
| } | ||
|
|
||
| serverPK := cipher.PubKey{} | ||
| if err := serverPK.UnmarshalText([]byte(*serverPKStr)); err != nil { | ||
| log.WithError(err).Fatalln("Invalid VPN server pub key") | ||
| } | ||
|
|
||
| log.Infof("Connecting to VPN server %s", serverPK.String()) | ||
|
|
||
| appCfg, err := app.ClientConfigFromEnv() | ||
| if err != nil { | ||
| log.WithError(err).Fatalln("Error getting app client config") | ||
| } | ||
|
|
||
| appClient, err := app.NewClient(logging.MustGetLogger(fmt.Sprintf("app_%s", appName)), appCfg) | ||
| if err != nil { | ||
| log.WithError(err).Fatalln("Error setting up VPN client") | ||
| } | ||
| defer func() { | ||
| appClient.Close() | ||
| }() | ||
|
|
||
| appConn, err := dialServer(appClient, serverPK) | ||
| if err != nil { | ||
| log.WithError(err).Fatalln("Error connecting to VPN server") | ||
| } | ||
| defer func() { | ||
| if err := appConn.Close(); err != nil { | ||
| log.WithError(err).Errorln("Error closing connection to the VPN server") | ||
| } | ||
| }() | ||
|
|
||
| log.Infof("Dialed %s", appConn.RemoteAddr()) | ||
|
|
||
| vpnClient, err := vpn.NewClient(log, appConn) | ||
| if err != nil { | ||
| log.WithError(err).Fatalln("Error creating VPN client") | ||
| } | ||
|
|
||
| osSigs := make(chan os.Signal, 2) | ||
| sigs := []os.Signal{syscall.SIGTERM, syscall.SIGINT} | ||
| for _, sig := range sigs { | ||
| signal.Notify(osSigs, sig) | ||
| } | ||
|
|
||
| go func() { | ||
| <-osSigs | ||
| vpnClient.Close() | ||
| }() | ||
|
|
||
| if err := vpnClient.Serve(); err != nil { | ||
| log.WithError(err).Fatalln("Error serving VPN") | ||
| } | ||
| } |
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,75 @@ | ||
| package main | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "os" | ||
| "os/signal" | ||
| "syscall" | ||
|
|
||
| "github.com/SkycoinProject/skycoin/src/util/logging" | ||
|
|
||
| "github.com/SkycoinProject/skywire-mainnet/internal/vpn" | ||
| "github.com/SkycoinProject/skywire-mainnet/pkg/app" | ||
| "github.com/SkycoinProject/skywire-mainnet/pkg/app/appnet" | ||
| "github.com/SkycoinProject/skywire-mainnet/pkg/routing" | ||
| "github.com/SkycoinProject/skywire-mainnet/pkg/skyenv" | ||
| ) | ||
|
|
||
| const ( | ||
| appName = skyenv.VPNServerName | ||
| netType = appnet.TypeSkynet | ||
| vpnPort = routing.Port(skyenv.VPNServerPort) | ||
| ) | ||
|
|
||
| var ( | ||
| log = app.NewLogger(appName) | ||
| ) | ||
|
|
||
| func main() { | ||
| appCfg, err := app.ClientConfigFromEnv() | ||
| if err != nil { | ||
| log.WithError(err).Errorln("Error getting app client config") | ||
| return | ||
| } | ||
|
|
||
| appClient, err := app.NewClient(logging.MustGetLogger(fmt.Sprintf("app_%s", appName)), appCfg) | ||
| if err != nil { | ||
| log.WithError(err).Errorln("Error setting up VPN client") | ||
| return | ||
| } | ||
| defer func() { | ||
| appClient.Close() | ||
| }() | ||
|
|
||
| osSigs := make(chan os.Signal, 2) | ||
|
|
||
| sigs := []os.Signal{syscall.SIGTERM, syscall.SIGINT} | ||
| for _, sig := range sigs { | ||
| signal.Notify(osSigs, sig) | ||
| } | ||
|
|
||
| l, err := appClient.Listen(netType, vpnPort) | ||
| if err != nil { | ||
| log.WithError(err).Errorf("Error listening network %v on port %d", netType, vpnPort) | ||
| return | ||
| } | ||
|
|
||
| log.Infof("Got app listener, bound to %d", vpnPort) | ||
|
|
||
| srv, err := vpn.NewServer(log) | ||
| if err != nil { | ||
| log.WithError(err).Fatalln("Error creating VPN server") | ||
| } | ||
| defer func() { | ||
| if err := srv.Close(); err != nil { | ||
| log.WithError(err).Errorln("Error closing server") | ||
| } | ||
| }() | ||
| go func() { | ||
| if err := srv.Serve(l); err != nil { | ||
| log.WithError(err).Errorln("Error serving") | ||
| } | ||
| }() | ||
|
|
||
| <-osSigs | ||
| } |
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
Oops, something went wrong.