From 9df566e1e689109135f90136d8fa1f033b55d557 Mon Sep 17 00:00:00 2001 From: mleku Date: Tue, 15 Oct 2024 20:14:14 +0100 Subject: [PATCH] delete message removed from privileged list --- .gitmodules | 0 appdata/LICENSE | 0 appdata/README.md | 0 atomic/.codecov.yml | 0 atomic/CHANGELOG.md | 0 atomic/LICENSE | 0 atomic/Makefile | 0 atomic/README.md | 0 atomic/internal/gen-atomicint/wrapper.tmpl | 0 atomic/internal/gen-atomicwrapper/wrapper.tmpl | 0 cmd/lerproxy/LICENSE | 0 cmd/lerproxy/README.md | 0 cmd/realy/app/config.go | 1 + cmd/realy/main.go | 1 - cmd/vainstr/LICENSE | 0 cmd/vainstr/README.md | 0 ec/LICENSE | 0 ec/README.md | 0 ec/base58/LICENSE | 0 ec/base58/README.md | 0 ec/base58/cov_report.sh | 0 ec/bech32/README.md | 0 ec/chainhash/README.md | 0 ec/ecdsa/README.md | 0 ec/musig2/data/key_agg_vectors.json | 0 ec/musig2/data/key_sort_vectors.json | 0 ec/musig2/data/nonce_agg_vectors.json | 0 ec/musig2/data/nonce_gen_vectors.json | 0 ec/musig2/data/sig_agg_vectors.json | 0 ec/musig2/data/sign_verify_vectors.json | 0 ec/musig2/data/tweak_vectors.json | 0 ec/schnorr/bip/bip-0340.mediawiki | 0 ec/schnorr/bip/bip340/reference.py | 0 ec/schnorr/bip/bip340/test-vectors.csv | 0 ec/schnorr/bip/bip340/test-vectors.py | 0 ec/sec2-v2.pdf | Bin ec/secp256k1/LICENSE | 0 ec/secp256k1/README.md | 0 ec/secp256k1/rawbytepoints.bin | Bin encryption/README.md | 0 event/examples/out.jsonl | 0 interrupt/README.md | 0 ints/base10k.txt | 0 kind/kind.go | 1 - lol/README.md | 0 p256k/README.md | 0 qu/README.md | 0 realy/handlers.go | 6 +++--- realy/server.go | 8 ++++---- scripts/runtests.sh | 0 sha256/test-architectures.sh | 0 51 files changed, 8 insertions(+), 9 deletions(-) mode change 100755 => 100644 .gitmodules mode change 100755 => 100644 appdata/LICENSE mode change 100755 => 100644 appdata/README.md mode change 100755 => 100644 atomic/.codecov.yml mode change 100755 => 100644 atomic/CHANGELOG.md mode change 100755 => 100644 atomic/LICENSE mode change 100755 => 100644 atomic/Makefile mode change 100755 => 100644 atomic/README.md mode change 100755 => 100644 atomic/internal/gen-atomicint/wrapper.tmpl mode change 100755 => 100644 atomic/internal/gen-atomicwrapper/wrapper.tmpl mode change 100755 => 100644 cmd/lerproxy/LICENSE mode change 100755 => 100644 cmd/lerproxy/README.md mode change 100755 => 100644 cmd/vainstr/LICENSE mode change 100755 => 100644 cmd/vainstr/README.md mode change 100755 => 100644 ec/LICENSE mode change 100755 => 100644 ec/README.md mode change 100755 => 100644 ec/base58/LICENSE mode change 100755 => 100644 ec/base58/README.md mode change 100755 => 100644 ec/base58/cov_report.sh mode change 100755 => 100644 ec/bech32/README.md mode change 100755 => 100644 ec/chainhash/README.md mode change 100755 => 100644 ec/ecdsa/README.md mode change 100755 => 100644 ec/musig2/data/key_agg_vectors.json mode change 100755 => 100644 ec/musig2/data/key_sort_vectors.json mode change 100755 => 100644 ec/musig2/data/nonce_agg_vectors.json mode change 100755 => 100644 ec/musig2/data/nonce_gen_vectors.json mode change 100755 => 100644 ec/musig2/data/sig_agg_vectors.json mode change 100755 => 100644 ec/musig2/data/sign_verify_vectors.json mode change 100755 => 100644 ec/musig2/data/tweak_vectors.json mode change 100755 => 100644 ec/schnorr/bip/bip-0340.mediawiki mode change 100755 => 100644 ec/schnorr/bip/bip340/reference.py mode change 100755 => 100644 ec/schnorr/bip/bip340/test-vectors.csv mode change 100755 => 100644 ec/schnorr/bip/bip340/test-vectors.py mode change 100755 => 100644 ec/sec2-v2.pdf mode change 100755 => 100644 ec/secp256k1/LICENSE mode change 100755 => 100644 ec/secp256k1/README.md mode change 100755 => 100644 ec/secp256k1/rawbytepoints.bin mode change 100755 => 100644 encryption/README.md mode change 100755 => 100644 event/examples/out.jsonl mode change 100755 => 100644 interrupt/README.md mode change 100755 => 100644 ints/base10k.txt mode change 100755 => 100644 lol/README.md mode change 100755 => 100644 p256k/README.md mode change 100755 => 100644 qu/README.md mode change 100755 => 100644 scripts/runtests.sh mode change 100755 => 100644 sha256/test-architectures.sh diff --git a/.gitmodules b/.gitmodules old mode 100755 new mode 100644 diff --git a/appdata/LICENSE b/appdata/LICENSE old mode 100755 new mode 100644 diff --git a/appdata/README.md b/appdata/README.md old mode 100755 new mode 100644 diff --git a/atomic/.codecov.yml b/atomic/.codecov.yml old mode 100755 new mode 100644 diff --git a/atomic/CHANGELOG.md b/atomic/CHANGELOG.md old mode 100755 new mode 100644 diff --git a/atomic/LICENSE b/atomic/LICENSE old mode 100755 new mode 100644 diff --git a/atomic/Makefile b/atomic/Makefile old mode 100755 new mode 100644 diff --git a/atomic/README.md b/atomic/README.md old mode 100755 new mode 100644 diff --git a/atomic/internal/gen-atomicint/wrapper.tmpl b/atomic/internal/gen-atomicint/wrapper.tmpl old mode 100755 new mode 100644 diff --git a/atomic/internal/gen-atomicwrapper/wrapper.tmpl b/atomic/internal/gen-atomicwrapper/wrapper.tmpl old mode 100755 new mode 100644 diff --git a/cmd/lerproxy/LICENSE b/cmd/lerproxy/LICENSE old mode 100755 new mode 100644 diff --git a/cmd/lerproxy/README.md b/cmd/lerproxy/README.md old mode 100755 new mode 100644 diff --git a/cmd/realy/app/config.go b/cmd/realy/app/config.go index d7e4287..e970476 100644 --- a/cmd/realy/app/config.go +++ b/cmd/realy/app/config.go @@ -48,6 +48,7 @@ func NewConfig() (cfg *Config, err E) { if err = env.Load(cfg, &env.Options{Source: e}); chk.E(err) { return } + log.I.S(cfg) // if err = env.Load(cfg, nil); err != nil { // return // } diff --git a/cmd/realy/main.go b/cmd/realy/main.go index 872ceff..662fcbe 100644 --- a/cmd/realy/main.go +++ b/cmd/realy/main.go @@ -30,7 +30,6 @@ func main() { } log.I.Ln("log level", cfg.LogLevel) lol.SetLogLevel(cfg.LogLevel) - log.D.S(cfg) var wg sync.WaitGroup c, cancel := context.Cancel(context.Bg()) path := filepath.Join(cfg.Root, cfg.Profile) diff --git a/cmd/vainstr/LICENSE b/cmd/vainstr/LICENSE old mode 100755 new mode 100644 diff --git a/cmd/vainstr/README.md b/cmd/vainstr/README.md old mode 100755 new mode 100644 diff --git a/ec/LICENSE b/ec/LICENSE old mode 100755 new mode 100644 diff --git a/ec/README.md b/ec/README.md old mode 100755 new mode 100644 diff --git a/ec/base58/LICENSE b/ec/base58/LICENSE old mode 100755 new mode 100644 diff --git a/ec/base58/README.md b/ec/base58/README.md old mode 100755 new mode 100644 diff --git a/ec/base58/cov_report.sh b/ec/base58/cov_report.sh old mode 100755 new mode 100644 diff --git a/ec/bech32/README.md b/ec/bech32/README.md old mode 100755 new mode 100644 diff --git a/ec/chainhash/README.md b/ec/chainhash/README.md old mode 100755 new mode 100644 diff --git a/ec/ecdsa/README.md b/ec/ecdsa/README.md old mode 100755 new mode 100644 diff --git a/ec/musig2/data/key_agg_vectors.json b/ec/musig2/data/key_agg_vectors.json old mode 100755 new mode 100644 diff --git a/ec/musig2/data/key_sort_vectors.json b/ec/musig2/data/key_sort_vectors.json old mode 100755 new mode 100644 diff --git a/ec/musig2/data/nonce_agg_vectors.json b/ec/musig2/data/nonce_agg_vectors.json old mode 100755 new mode 100644 diff --git a/ec/musig2/data/nonce_gen_vectors.json b/ec/musig2/data/nonce_gen_vectors.json old mode 100755 new mode 100644 diff --git a/ec/musig2/data/sig_agg_vectors.json b/ec/musig2/data/sig_agg_vectors.json old mode 100755 new mode 100644 diff --git a/ec/musig2/data/sign_verify_vectors.json b/ec/musig2/data/sign_verify_vectors.json old mode 100755 new mode 100644 diff --git a/ec/musig2/data/tweak_vectors.json b/ec/musig2/data/tweak_vectors.json old mode 100755 new mode 100644 diff --git a/ec/schnorr/bip/bip-0340.mediawiki b/ec/schnorr/bip/bip-0340.mediawiki old mode 100755 new mode 100644 diff --git a/ec/schnorr/bip/bip340/reference.py b/ec/schnorr/bip/bip340/reference.py old mode 100755 new mode 100644 diff --git a/ec/schnorr/bip/bip340/test-vectors.csv b/ec/schnorr/bip/bip340/test-vectors.csv old mode 100755 new mode 100644 diff --git a/ec/schnorr/bip/bip340/test-vectors.py b/ec/schnorr/bip/bip340/test-vectors.py old mode 100755 new mode 100644 diff --git a/ec/sec2-v2.pdf b/ec/sec2-v2.pdf old mode 100755 new mode 100644 diff --git a/ec/secp256k1/LICENSE b/ec/secp256k1/LICENSE old mode 100755 new mode 100644 diff --git a/ec/secp256k1/README.md b/ec/secp256k1/README.md old mode 100755 new mode 100644 diff --git a/ec/secp256k1/rawbytepoints.bin b/ec/secp256k1/rawbytepoints.bin old mode 100755 new mode 100644 diff --git a/encryption/README.md b/encryption/README.md old mode 100755 new mode 100644 diff --git a/event/examples/out.jsonl b/event/examples/out.jsonl old mode 100755 new mode 100644 diff --git a/interrupt/README.md b/interrupt/README.md old mode 100755 new mode 100644 diff --git a/ints/base10k.txt b/ints/base10k.txt old mode 100755 new mode 100644 diff --git a/kind/kind.go b/kind/kind.go index 7bb7ed1..a544148 100644 --- a/kind/kind.go +++ b/kind/kind.go @@ -41,7 +41,6 @@ var Privileged = []*T{ GiftWrap, GiftWrapWithKind4, ApplicationSpecificData, - Deletion, } func (k *T) IsPrivileged() (is bool) { diff --git a/lol/README.md b/lol/README.md old mode 100755 new mode 100644 diff --git a/p256k/README.md b/p256k/README.md old mode 100755 new mode 100644 diff --git a/qu/README.md b/qu/README.md old mode 100755 new mode 100644 diff --git a/realy/handlers.go b/realy/handlers.go index 44384d7..afa6bc5 100644 --- a/realy/handlers.go +++ b/realy/handlers.go @@ -138,7 +138,7 @@ func (s *Server) doEvent(c Ctx, ws *web.Socket, req B, sto store.I) (msg B) { normalize.AuthRequired.F("auth required for request processing")). Write(ws); err != nil { } - log.T.F("requesting auth from client") + log.T.F("requesting auth from client %s", ws.RealRemote()) if err = authenvelope.NewChallengeWith(ws.Challenge()).Write(ws); err != nil { return } @@ -149,7 +149,7 @@ func (s *Server) doEvent(c Ctx, ws *web.Socket, req B, sto store.I) (msg B) { normalize.AuthRequired.F("auth required for storing events")). Write(ws); err != nil { } - log.T.F("requesting auth again from client") + log.T.F("requesting auth again from client %s", ws.RealRemote()) if err = authenvelope.NewChallengeWith(ws.Challenge()).Write(ws); err != nil { return } @@ -436,7 +436,7 @@ func (s *Server) doReq(c Ctx, ws *web.Socket, req B, sto store.I) (r B) { if auther, ok := s.relay.(relay.Authenticator); ok && auther.AuthEnabled() { if f.Kinds.IsPrivileged() { - log.T.Ln("privileged request with auth enabled") + log.T.F("privileged request with auth enabled\n%s", f.Serialize()) senders := f.Authors receivers := f.Tags.GetAll(tag.New("#p")) // log.I.S(senders, receivers) diff --git a/realy/server.go b/realy/server.go index 8206a3d..8f0b4a2 100644 --- a/realy/server.go +++ b/realy/server.go @@ -114,15 +114,15 @@ func (s *Server) Start(host S, port int, adminHost S, adminPort int, started ... s.httpServer = &http.Server{ Handler: cors.Default().Handler(s), Addr: addr, - WriteTimeout: 2 * time.Second, - ReadTimeout: 2 * time.Second, + WriteTimeout: 4 * time.Second, + ReadTimeout: 4 * time.Second, IdleTimeout: 30 * time.Second, } s.adminServer = &http.Server{ Handler: cors.Default().Handler(s), Addr: adminAddr, - WriteTimeout: 2 * time.Second, - ReadTimeout: 2 * time.Second, + WriteTimeout: 4 * time.Second, + ReadTimeout: 4 * time.Second, IdleTimeout: 30 * time.Second, } diff --git a/scripts/runtests.sh b/scripts/runtests.sh old mode 100755 new mode 100644 diff --git a/sha256/test-architectures.sh b/sha256/test-architectures.sh old mode 100755 new mode 100644