Simplify bitmask creation

Separate clearnet and onion tests
This commit is contained in:
y a t s
2026-06-03 12:30:57 -04:00
parent 66e6f74a4b
commit 840a63f727
4 changed files with 53 additions and 46 deletions
+44 -32
View File
@@ -33,33 +33,32 @@ func solveTest(ctx context.Context, hc http.Client, host string) error {
connType = "tor"
}
steps := int8(1)
for steps > 0 {
log.Printf("Fetching new %s challenge...", connType)
c, err := NewChallenge(ctx, hc, host)
if err != nil {
return err
}
log.Printf("Challenge: %s, Difficulty: %d, Steps: %d\n", c.Salt, c.Diff, c.Steps)
steps = c.Steps
s, err := Solve(ctx, c)
if err != nil {
return err
}
log.Printf("Solution hash: %x, nonce: %d\n", s.Hash, s.Nonce)
resp, err := Submit(ctx, hc, s, "")
if err != nil {
return err
}
b, err := io.ReadAll(resp.Body)
log.Printf("Response: %s\n\n", b[:60])
resp.Body.Close()
log.Printf("Fetching new %s challenge...", connType)
c, err := NewChallenge(ctx, hc, host)
if err != nil {
return err
}
log.Printf("Challenge: %s, Difficulty: %d, Steps: %d\n", c.Salt, c.Diff, c.Steps)
s, err := Solve(ctx, c)
if err != nil {
return err
}
log.Printf("Solution hash: %x, nonce: %d\n", s.Hash, s.Nonce)
resp, err := Submit(ctx, hc, s, "")
if err != nil {
return err
}
defer resp.Body.Close()
cookies := resp.Cookies()
for _, ck := range cookies {
log.Printf("Cookie: %s\n", ck.String())
}
log.Print("Response: ")
io.CopyN(log.Writer(), resp.Body, 128)
fmt.Print("\n...\n")
return nil
}
@@ -73,7 +72,7 @@ func newProxyTransport() *http.Transport {
return tr
}
func TestSubmit(t *testing.T) {
func TestSolve(t *testing.T) {
ctx := t.Context()
jar, err := cookiejar.New(nil)
@@ -87,16 +86,29 @@ func TestSubmit(t *testing.T) {
t.Error(err)
return
}
}
var dnsErr *net.DNSError
err = solveTest(ctx, http.Client{Transport: newProxyTransport()}, _TEST_ONION)
func TestOnionSolve(t *testing.T) {
ctx := t.Context()
jar, err := cookiejar.New(nil)
if err != nil {
if errors.As(err, &dnsErr) {
t.Error(err)
return
}
err = solveTest(ctx, http.Client{
Jar: jar,
Transport: newProxyTransport(),
}, _TEST_ONION)
if err != nil {
if _, ok := errors.AsType[*net.DNSError](err); ok {
log.Println("Unable to resolve .onion domain. Make sure ALL_PROXY is set and tor is running.")
log.Println("Skipping...")
} else {
t.Error(err)
return
}
t.Error(err)
}
}