fix(policy/checker): more explicit short-circuit

Signed-off-by: Xe Iaso <me@xeiaso.net>

.github/actions/spelling/allow.txt

@@ -7,3 +7,4 @@ rjack
 msgbox
 xeact
 ABee
+tencent

README.md

@@ -66,7 +66,7 @@ Anubis is a bit of a nuclear response. This will result in your website being bl
 
 In most cases, you should not need this and can probably get by using Cloudflare to protect a given origin. However, for circumstances where you can't or won't use Cloudflare, Anubis is there for you.
 
-If you want to try this out, connect to [anubis.techaro.lol](https://anubis.techaro.lol).
+If you want to try this out, visit the Anubis documentation site at [anubis.techaro.lol](https://anubis.techaro.lol).
 
 ## Support
 

data/bots/_deny-pathological.yaml

@@ -4,3 +4,4 @@
 - import: (data)/bots/custom-async-http-client.yaml
 - import: (data)/crawlers/alibaba-cloud.yaml
 - import: (data)/crawlers/huawei-cloud.yaml
+- import: (data)/crawlers/tencent-cloud.yaml

data/crawlers/tencent-cloud.yaml

@@ -0,0 +1,165 @@
+# Tencent Cloud crawler IP ranges
+- name: tencent-cloud
+  action: DENY
+  remote_addresses:
+    - 101.32.0.0/17
+    - 101.32.176.0/20
+    - 101.32.192.0/18
+    - 101.33.116.0/22
+    - 101.33.120.0/21
+    - 101.33.16.0/20
+    - 101.33.2.0/23
+    - 101.33.32.0/19
+    - 101.33.4.0/22
+    - 101.33.64.0/19
+    - 101.33.8.0/21
+    - 101.33.96.0/20
+    - 119.28.28.0/24
+    - 119.29.29.0/24
+    - 124.156.0.0/16
+    - 129.226.0.0/18
+    - 129.226.128.0/18
+    - 129.226.224.0/19
+    - 129.226.96.0/19
+    - 150.109.0.0/18
+    - 150.109.128.0/20
+    - 150.109.160.0/19
+    - 150.109.192.0/18
+    - 150.109.64.0/20
+    - 150.109.80.0/21
+    - 150.109.88.0/22
+    - 150.109.96.0/19
+    - 162.14.60.0/22
+    - 162.62.0.0/18
+    - 162.62.128.0/20
+    - 162.62.144.0/21
+    - 162.62.152.0/22
+    - 162.62.172.0/22
+    - 162.62.176.0/20
+    - 162.62.192.0/19
+    - 162.62.255.0/24
+    - 162.62.80.0/20
+    - 162.62.96.0/19
+    - 170.106.0.0/16
+    - 43.128.0.0/14
+    - 43.132.0.0/22
+    - 43.132.12.0/22
+    - 43.132.128.0/17
+    - 43.132.16.0/22
+    - 43.132.28.0/22
+    - 43.132.32.0/22
+    - 43.132.40.0/22
+    - 43.132.52.0/22
+    - 43.132.60.0/24
+    - 43.132.64.0/22
+    - 43.132.69.0/24
+    - 43.132.70.0/23
+    - 43.132.72.0/21
+    - 43.132.80.0/21
+    - 43.132.88.0/22
+    - 43.132.92.0/23
+    - 43.132.96.0/19
+    - 43.133.0.0/16
+    - 43.134.0.0/16
+    - 43.135.0.0/17
+    - 43.135.128.0/18
+    - 43.135.192.0/19
+    - 43.152.0.0/21
+    - 43.152.11.0/24
+    - 43.152.12.0/22
+    - 43.152.128.0/22
+    - 43.152.133.0/24
+    - 43.152.134.0/23
+    - 43.152.136.0/21
+    - 43.152.144.0/20
+    - 43.152.160.0/22
+    - 43.152.16.0/21
+    - 43.152.164.0/23
+    - 43.152.166.0/24
+    - 43.152.168.0/21
+    - 43.152.178.0/23
+    - 43.152.180.0/22
+    - 43.152.184.0/21
+    - 43.152.192.0/18
+    - 43.152.24.0/22
+    - 43.152.31.0/24
+    - 43.152.32.0/23
+    - 43.152.35.0/24
+    - 43.152.36.0/22
+    - 43.152.40.0/21
+    - 43.152.48.0/20
+    - 43.152.74.0/23
+    - 43.152.76.0/22
+    - 43.152.80.0/22
+    - 43.152.8.0/23
+    - 43.152.92.0/23
+    - 43.153.0.0/16
+    - 43.154.0.0/15
+    - 43.156.0.0/15
+    - 43.158.0.0/16
+    - 43.159.0.0/20
+    - 43.159.128.0/17
+    - 43.159.64.0/23
+    - 43.159.70.0/23
+    - 43.159.72.0/21
+    - 43.159.81.0/24
+    - 43.159.82.0/23
+    - 43.159.85.0/24
+    - 43.159.86.0/23
+    - 43.159.88.0/21
+    - 43.159.96.0/19
+    - 43.160.0.0/15
+    - 43.162.0.0/16
+    - 43.163.0.0/17
+    - 43.163.128.0/18
+    - 43.163.192.255/32
+    - 43.163.193.0/24
+    - 43.163.194.0/23
+    - 43.163.196.0/22
+    - 43.163.200.0/21
+    - 43.163.208.0/20
+    - 43.163.224.0/19
+    - 43.164.0.0/18
+    - 43.164.128.0/17
+    - 43.165.0.0/16
+    - 43.166.128.0/18
+    - 43.166.224.0/19
+    - 43.168.0.0/20
+    - 43.168.16.0/21
+    - 43.168.24.0/22
+    - 43.168.255.0/24
+    - 43.168.32.0/19
+    - 43.168.64.0/20
+    - 43.168.80.0/22
+    - 43.169.0.0/16
+    - 43.170.0.0/16
+    - 43.174.0.0/18
+    - 43.174.128.0/17
+    - 43.174.64.0/22
+    - 43.174.68.0/23
+    - 43.174.71.0/24
+    - 43.174.74.0/23
+    - 43.174.76.0/22
+    - 43.174.80.0/20
+    - 43.174.96.0/19
+    - 43.175.0.0/20
+    - 43.175.113.0/24
+    - 43.175.114.0/23
+    - 43.175.116.0/22
+    - 43.175.120.0/21
+    - 43.175.128.0/18
+    - 43.175.16.0/22
+    - 43.175.192.0/20
+    - 43.175.20.0/23
+    - 43.175.208.0/21
+    - 43.175.216.0/22
+    - 43.175.220.0/23
+    - 43.175.22.0/24
+    - 43.175.222.0/24
+    - 43.175.224.0/20
+    - 43.175.25.0/24
+    - 43.175.26.0/23
+    - 43.175.28.0/22
+    - 43.175.32.0/19
+    - 43.175.64.0/19
+    - 43.175.96.0/20

docs/docs/CHANGELOG.md

@@ -15,12 +15,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## v1.23.0: Lyse Hext
 
+- Add default tencent cloud DENY rule.
 - Added `(data)/meta/default-config.yaml` for importing the entire default configuration at once.
 - Add `-custom-real-ip-header` flag to get the original request IP from a different header than `x-real-ip`.
 - Add `contentLength` variable to bot expressions.
 - Add `COOKIE_SAME_SITE_MODE` to force anubis cookies SameSite value, and downgrade automatically from `None` to `Lax` if cookie is insecure.
 - Fix lock convoy problem in decaymap ([#1103](https://github.com/TecharoHQ/anubis/issues/1103)).
 - Fix lock convoy problem in bbolt by implementing the actor pattern ([#1103](https://github.com/TecharoHQ/anubis/issues/1103)).
+- Remove bbolt actorify implementation due to causing production issues.
 - Document missing environment variables in installation guide: `SLOG_LEVEL`, `COOKIE_PREFIX`, `FORCED_LANGUAGE`, and `TARGET_DISABLE_KEEPALIVE` ([#1086](https://github.com/TecharoHQ/anubis/pull/1086)).
 - Add validation warning when persistent storage is used without setting signing keys.
 - Fixed `robots2policy` to properly group consecutive user agents into `any:` instead of only processing the last one ([#925](https://github.com/TecharoHQ/anubis/pull/925)).
@@ -39,6 +41,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Add option to set `targetSNI` to special keyword 'auto' to indicate that it should be automatically set to the request Host name ([424](https://github.com/TecharoHQ/anubis/issues/424)).
 - The Preact challenge has been removed from the default configuration. It will be deprecated in the future.
 
+### Potentially breaking changes
+
+#### Multiple checks at once has and-like semantics instead of or-like semantics
+
+Anubis lets you stack multiple checks at once with blocks like this:
+
+```yaml
+name: allow-prometheus
+action: ALLOW
+user_agent_regex: ^prometheus-probe$
+remote_addresses:
+  - 192.168.2.0/24
+```
+
+Previously, this only returned ALLOW if _any one_ of the conditions matched. This behaviour has changed to only return ALLOW if _all_ of the conditions match. I expect this to have some issues with user configs, however this fix is grave enough that it's worth the risk of breaking configs. If this bites you, please let me know so we can make an escape hatch.
+
 ### Better error messages
 
 In order to make it easier for legitimate clients to debug issues with their browser configuration and Anubis, Anubis will emit internal error detail in base 64 so that administrators can chase down issues. Future versions of this may also include a variant that encrypts the error detail messages.

docs/src/pages/index.tsx

@@ -18,7 +18,10 @@ function HomepageHeader() {
         </Heading>
         <p className="hero__subtitle">{siteConfig.tagline}</p>
         <div className={styles.buttons}>
-          <Link className="button button--secondary button--lg" to="/docs/">
+          <Link
+            className="button button--secondary button--lg"
+            to="/docs/category/environments"
+          >
             Get started
           </Link>
         </div>

lib/policy/checker/checker.go

@@ -16,18 +16,24 @@ type Impl interface {
 
 type List []Impl
 
+// Check runs each checker in the list against the request.
+// It returns true only if *all* checkers return true (AND semantics).
+// If any checker returns an error, the function returns false and the error.
 func (l List) Check(r *http.Request) (bool, error) {
 	for _, c := range l {
 		ok, err := c.Check(r)
 		if err != nil {
-			return ok, err
+			// Propagate the error; overall result is false.
+			return false, err
 		}
-		if ok {
-			return ok, nil
+		if !ok {
+			// One false means the combined result is false. Short-circuit
+			// so we don't waste time.
+			return false, err
 		}
 	}
-
-	return false, nil
+	// Assume success until a checker says otherwise.
+	return true, nil
 }
 
 func (l List) Hash() string {

lib/policy/checker/checker_test.go

@@ -0,0 +1,57 @@
+package checker
+
+import (
+	"errors"
+	"net/http"
+	"testing"
+)
+
+// Mock implements the Impl interface for testing.
+type Mock struct {
+	result bool
+	err    error
+	hash   string
+}
+
+func (m Mock) Check(r *http.Request) (bool, error) { return m.result, m.err }
+func (m Mock) Hash() string                        { return m.hash }
+
+func TestListCheck_AndSemantics(t *testing.T) {
+	req, _ := http.NewRequest(http.MethodGet, "http://example.com", nil)
+
+	tests := []struct {
+		name    string
+		list    List
+		want    bool
+		wantErr bool
+	}{
+		{
+			name: "all true",
+			list: List{Mock{true, nil, "a"}, Mock{true, nil, "b"}},
+			want: true,
+		},
+		{
+			name: "one false",
+			list: List{Mock{true, nil, "a"}, Mock{false, nil, "b"}},
+			want: false,
+		},
+		{
+			name:    "error propagates",
+			list:    List{Mock{true, nil, "a"}, Mock{true, errors.New("boom"), "b"}},
+			want:    false,
+			wantErr: true,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got, err := tt.list.Check(req)
+			if (err != nil) != tt.wantErr {
+				t.Fatalf("unexpected error state: %v", err)
+			}
+			if got != tt.want {
+				t.Fatalf("expected %v, got %v", tt.want, got)
+			}
+		})
+	}
+}

lib/store/bbolt/factory.go

@@ -48,7 +48,7 @@ func (Factory) Build(ctx context.Context, data json.RawMessage) (store.Interface
 
 	go result.cleanupThread(ctx)
 
-	return store.NewActorifiedStore(result), nil
+	return result, nil
 }
 
 // Valid parses and validates the bbolt store Config or returns