Raise copyright years

[tofuproxy.git] / rounds / spy.go

diff --git a/rounds/spy.go b/rounds/spy.go
index 3b242f8cfd2b686a37d230c80553ee6508a3e558..ee785cca96904324385d0fe86692445c1b742271 100644 (file)
--- a/rounds/spy.go
+++ b/rounds/spy.go
@@ -1,6 +1,7 @@
 /*
-tofuproxy -- HTTP proxy with TLS certificates management
-Copyright (C) 2021 Sergey Matveev <stargrave@stargrave.org>
+tofuproxy -- flexible HTTP/HTTPS proxy, TLS terminator, X.509 TOFU
+             manager, WARC/geminispace browser
+Copyright (C) 2021-2023 Sergey Matveev <stargrave@stargrave.org>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -22,31 +23,14 @@ import (
        "net/http"
        "strings"
 
+       "go.stargrave.org/tofuproxy/caches"
        "go.stargrave.org/tofuproxy/fifos"
 )
 
-var spyDomains = []string{
-       "google-analytics.com",
-       "goo.gl",
-       "ads.google.com",
-       "googletagmanager.com",
-       "facebook.com",
-       "facebook.net",
-       "fbcdn.com",
-       "fbcdn.net",
-       "advertising.yandex.ru",
-       "an.yandex.ru",
-       "awaps.yandex.ru",
-       "bs.yandex.ru",
-       "informer.yandex.ru",
-       "mc.yandex.ru",
-       "metrika.yandex.ru",
-       "doubleclick.net",
-       "tns-counter.ru",
-}
-
 func IsSpy(host string) bool {
-       for _, spy := range spyDomains {
+       caches.SpiesM.RLock()
+       defer caches.SpiesM.RUnlock()
+       for _, spy := range caches.Spies {
                if strings.HasSuffix(host, spy) {
                        return true
                }
@@ -62,12 +46,7 @@ func RoundDenySpy(
 ) (bool, error) {
        if IsSpy(host) {
                http.NotFound(w, req)
-               fifos.SinkOther <- fmt.Sprintf(
-                       "%s %s\t%d\tdeny spy",
-                       req.Method,
-                       req.URL.String(),
-                       http.StatusNotFound,
-               )
+               fifos.LogVarious <- fmt.Sprintf("%s %s\tdeny spy", req.Method, req.URL)
                return false, nil
        }
        return true, nil