-
Notifications
You must be signed in to change notification settings - Fork 116
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
81f9e36
commit 9ed932c
Showing
5 changed files
with
133 additions
and
4 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,5 @@ | ||
| [app] | ||
| # Address to listen, use "tor" to run an hidden service. | ||
| address = "0.0.0.0:9000" | ||
|
|
||
| # No trailing slashes. | ||
|
|
||
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
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,91 @@ | ||
| package main | ||
|
|
||
| import ( | ||
| "context" | ||
| "crypto/ed25519" | ||
| "crypto/rand" | ||
| "crypto/x509" | ||
| "encoding/pem" | ||
| "fmt" | ||
| "io/ioutil" | ||
| "net/http" | ||
| "time" | ||
|
|
||
| "github.com/clementauger/tor-prebuilt/embedded" | ||
| "github.com/cretz/bine/tor" | ||
| "github.com/cretz/bine/torutil" | ||
| tued25519 "github.com/cretz/bine/torutil/ed25519" | ||
| "github.com/knadh/niltalk/store" | ||
| ) | ||
|
|
||
| func getOrCreatePK(store store.Store) (privateKey ed25519.PrivateKey, err error) { | ||
| key := "onionkey" | ||
| d, err := store.Get(key) | ||
| if len(d) == 0 || err != nil { | ||
| _, privateKey, err = ed25519.GenerateKey(rand.Reader) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| var x509Encoded []byte | ||
| x509Encoded, err = x509.MarshalPKCS8PrivateKey(privateKey) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| pemEncoded := pem.EncodeToMemory(&pem.Block{Type: "ED25519 PRIVATE KEY", Bytes: x509Encoded}) | ||
| err = store.Set(key, pemEncoded) | ||
| } else { | ||
| block, _ := pem.Decode(d) | ||
| x509Encoded := block.Bytes | ||
| var tPk interface{} | ||
| tPk, err = x509.ParsePKCS8PrivateKey(x509Encoded) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| if x, ok := tPk.(ed25519.PrivateKey); ok { | ||
| privateKey = x | ||
| } else { | ||
| err = fmt.Errorf("invalid key type %T wanted ed25519.PrivateKey", tPk) | ||
| } | ||
| } | ||
| return privateKey, err | ||
| } | ||
|
|
||
| type torServer struct { | ||
| Handler http.Handler | ||
| // PrivateKey path to a pem encoded ed25519 private key | ||
| PrivateKey ed25519.PrivateKey | ||
| } | ||
|
|
||
| func onionAddr(pk ed25519.PrivateKey) string { | ||
| return torutil.OnionServiceIDFromV3PublicKey(tued25519.PublicKey([]byte(pk.Public().(ed25519.PublicKey)))) | ||
| } | ||
|
|
||
| func (ts *torServer) ListenAndServe() error { | ||
|
|
||
| d, err := ioutil.TempDir("", "") | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| // Start tor with default config (can set start conf's DebugWriter to os.Stdout for debug logs) | ||
| // fmt.Println("Starting and registering onion service, please wait a couple of minutes...") | ||
| t, err := tor.Start(nil, &tor.StartConf{TempDataDirBase: d, ProcessCreator: embedded.NewCreator(), NoHush: true}) | ||
| if err != nil { | ||
| return fmt.Errorf("unable to start Tor: %v", err) | ||
| } | ||
| defer t.Close() | ||
|
|
||
| // Wait at most a few minutes to publish the service | ||
| listenCtx, listenCancel := context.WithTimeout(context.Background(), 3*time.Minute) | ||
| defer listenCancel() | ||
| // Create a v3 onion service to listen on any port but show as 80 | ||
| onion, err := t.Listen(listenCtx, &tor.ListenConf{Key: ts.PrivateKey, Version3: true, RemotePorts: []int{80}}) | ||
| if err != nil { | ||
| return fmt.Errorf("unable to create onion service: %v", err) | ||
| } | ||
| defer onion.Close() | ||
|
|
||
| // fmt.Printf("server listening at http://%v.onion\n", onion.ID) | ||
|
|
||
| return http.Serve(onion, ts.Handler) | ||
| } |