Skip to content

HellPot NextGen#163

Draft
yunginnanet wants to merge 50 commits intomainfrom
development
Draft

HellPot NextGen#163
yunginnanet wants to merge 50 commits intomainfrom
development

Conversation

@yunginnanet
Copy link
Copy Markdown
Owner

@yunginnanet yunginnanet commented Jun 26, 2024 •
edited
Loading

Overview

I accidentally a whole coca cola bottle HellPot

This really is essentially a rewrite.

  • The entire configuration system has been rewritten
  • The logger has been rewritten
  • The main package (app) has been rewritten

The only thing that remains untouched more or less is the heffalump core.

This should resolve countless idiosyncrasies in configuration behavior.

Improvements

  • Much more random, harder to detect
  • Test cases

New Features

  • Allow regular expressions for matching disallowed user agents in addition to the current strings.Contains match functionality
  • Remote syslog output (tcp/udp) (thank you zerolog)
  • Local syslog output for *nix via unix sockets (thank you zerolog)
  • CLI flags for all configuration values

New features by

are scheduled to hitch a ride, pending further review and testing.

Slimfast

Further slimming of dependencies

Issues resolved

ginger51011 and others added 21 commits June 26, 2024 02:16
@ginger51011 @yunginnanet
Add optional -b/--book flag to choose source file other than Niet…
146c5c1 
…zche

While I do think all bots enjoy Nietzche (who doesn't?), I think we should
take a stance to educate them. What better way than to be able to choose
from any book!

Personal suggestions include:

- The Sorrows of Young Werther by Goethe
- Any political manifesto
- The Declaration of Independence

etc. etc.
@ginger51011 @yunginnanet
Remove globals from heffalump/*, add NewDefault{Heffalump,MarkovMap}()
0ba61ed 
This removes globals from `heffalumpt/`, which are hard to reason about,
easy to get wrong, and should not be created if they are never used.

A possible drawbacks is if you would create multiple new defaults,
but this should never be the case.
@ginger51011 @yunginnanet
Add short flags to help, add --help flag
3671a67 
This prints the short variants (like `-c` for `--config`)
in the help.

Also fixes bug where only `-h` flag works, not `--help`.
@ginger51011 @yunginnanet
Rename --book to --grimoire, fix comments
3024b2d
@yunginnanet
TeeHee: Essentially rewrite HellPot :^)
0a18454
@yunginnanet
Fix: build and vet errors
f02f6bf
@yunginnanet
Fix: Remove unused git stash lint
b9702c2
@yunginnanet
SAST: Resolve gosec G304
a9a3e52
@yunginnanet
Fix: don't parse flags during unit tests
f0fcb56
@yunginnanet
Chore: prune deps
a09adb6 
Tacking this on to trigger github issue notifs:

Related to pull request GH-162:
closes #140
closes #139
@yunginnanet
Resolve #162 (comment)
5c0d345
@yunginnanet
Fix: nil check on buffer pointer
51ff751
@yunginnanet
WIP rewrite progress, config loading broken atm
c1977ba
@yunginnanet
Fix: fix configuration file loading
072ea6f
@yunginnanet
Security (logger): Resolve gosec G301 (CWE-276)
982a076
@yunginnanet
Security (logger): Resolve gosec G302 (CWE-276)
4977844
@yunginnanet
Chore: Tidy up, split up files in main package
d662ee9
@yunginnanet
Chore: go mod tidy
8b9603b
@yunginnanet
Fix: cli arg, config, and logger fixes
92818e4 
additionally:
  - fix `-c` flag
  - make main package test better
@yunginnanet
Fix: Embolden main package test, improve default config warning
578aea0
@yunginnanet
Fix: add missing util.go
23c65b9
@yunginnanet yunginnanet changed the title Development Rewrite Jun 26, 2024
@yunginnanet yunginnanet mentioned this pull request Jun 26, 2024
Closed
@yunginnanet
Copy link
Copy Markdown
Owner Author

yunginnanet commented Jun 26, 2024 •
edited
Loading

Mixing and matching configuration sources seems to be working well.

(Also pictured in screenshot: Grimoire test)

Screenshot

https://tcp.ac/i/Smhva.png

@yunginnanet yunginnanet changed the title Rewrite HellPot NextGen Jun 26, 2024
yunginnanet
yunginnanet commented Jul 1, 2024
View reviewed changes
Comment thread internal/config/command_line.go
os.Exit(2)
}

for defaultKey, defaultVal := range Defaults.val {
Copy link
Copy Markdown
Owner Author

@yunginnanet yunginnanet Jul 1, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Noting (for myself even): I was doing this here because of some problematic behavior when it comes to order of initialization and overrides when it comes to CLI vs defaults vs environment variables vs toml config

dependabot Bot and others added 5 commits July 1, 2024 17:34
@dependabot @yunginnanet
Bump github.com/knadh/koanf/providers/file from 0.1.0 to 1.0.0
42c3b2a 
Bumps [github.com/knadh/koanf/providers/file](https://github.com/knadh/koanf) from 0.1.0 to 1.0.0.
- [Release notes](https://github.com/knadh/koanf/releases)
- [Commits](knadh/koanf@v0.1.0...v1.0.0)

---
updated-dependencies:
- dependency-name: github.com/knadh/koanf/providers/file
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
@yunginnanet
Merge branch 'main' into development
043fb93
@yunginnanet
Feat: internal toml (Unmarshal) (WIP)
97bfa7c
@yunginnanet
Merge branch 'development' into internal_toml
22f01d3
@yunginnanet
Feat: Internal Toml (Unmarshal): Fix decoder, add test
3008d84
@yunginnanet yunginnanet mentioned this pull request Jul 3, 2024
Open
yunginnanet and others added 12 commits July 22, 2024 01:53
@yunginnanet
Fix: wrap error
d7ff3c3
@yunginnanet
Fix+Test: marshalling int slices + decoder progress
445008e
@yunginnanet
Checkpoint: initial toml decoding success
12f18cb
@yunginnanet
Chore: bump deps
9a1d012
@yunginnanet @dependabot
@LorenzoSapora @ginger51011 @fowlmouth
Merge main -> dev (#197)
87a34ef 
* Bump github.com/fasthttp/router from 1.5.1 to 1.5.2

Bumps [github.com/fasthttp/router](https://github.com/fasthttp/router) from 1.5.1 to 1.5.2.
- [Release notes](https://github.com/fasthttp/router/releases)
- [Commits](fasthttp/router@v1.5.1...v1.5.2)

---
updated-dependencies:
- dependency-name: github.com/fasthttp/router
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Fix (CI): strange CI failure

* Bump git.tcp.direct/kayos/common from 0.9.7 to 0.9.9

Bumps git.tcp.direct/kayos/common from 0.9.7 to 0.9.9.

---
updated-dependencies:
- dependency-name: git.tcp.direct/kayos/common
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump golang.org/x/term from 0.21.0 to 0.22.0

Bumps [golang.org/x/term](https://github.com/golang/term) from 0.21.0 to 0.22.0.
- [Commits](golang/term@v0.21.0...v0.22.0)

---
updated-dependencies:
- dependency-name: golang.org/x/term
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Fix: closes GH #164

* Security: Resolve gosec G300 CWE-276 file perm, fixes #164

* Chore(deps): Bump git.tcp.direct/kayos/common from 0.9.9 to 1.0.0

Bumps git.tcp.direct/kayos/common from 0.9.9 to 1.0.0.

---
updated-dependencies:
- dependency-name: git.tcp.direct/kayos/common
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* Fix typo

* Update Dockerfile

Update Go version to 1.21

* Chore(deps): Bump github.com/knadh/koanf/providers/file

Bumps [github.com/knadh/koanf/providers/file](https://github.com/knadh/koanf) from 1.0.0 to 1.1.0.
- [Release notes](https://github.com/knadh/koanf/releases)
- [Commits](knadh/koanf@v1.0.0...v1.1.0)

---
updated-dependencies:
- dependency-name: github.com/knadh/koanf/providers/file
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Chore(deps): Bump golang.org/x/term from 0.22.0 to 0.23.0

Bumps [golang.org/x/term](https://github.com/golang/term) from 0.22.0 to 0.23.0.
- [Commits](golang/term@v0.22.0...v0.23.0)

---
updated-dependencies:
- dependency-name: golang.org/x/term
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Security: resolve gosec G115 (CWE-190)

* Chore(deps): Bump wangyoucao577/go-release-action from 1.51 to 1.52

Bumps [wangyoucao577/go-release-action](https://github.com/wangyoucao577/go-release-action) from 1.51 to 1.52.
- [Release notes](https://github.com/wangyoucao577/go-release-action/releases)
- [Commits](wangyoucao577/go-release-action@v1.51...v1.52)

---
updated-dependencies:
- dependency-name: wangyoucao577/go-release-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Dependabot: batch updates

* Chore(deps): Bump the deps group with 4 updates

Bumps the deps group with 4 updates: [github.com/knadh/koanf/providers/env](https://github.com/knadh/koanf), [github.com/knadh/koanf/providers/file](https://github.com/knadh/koanf), [github.com/valyala/fasthttp](https://github.com/valyala/fasthttp) and [golang.org/x/term](https://github.com/golang/term).


Updates `github.com/knadh/koanf/providers/env` from 0.1.0 to 1.0.0
- [Release notes](https://github.com/knadh/koanf/releases)
- [Commits](knadh/koanf@v0.1.0...v1.0.0)

Updates `github.com/knadh/koanf/providers/file` from 1.1.0 to 1.1.2
- [Release notes](https://github.com/knadh/koanf/releases)
- [Commits](knadh/koanf@v1.1.0...providers/file/v1.1.2)

Updates `github.com/valyala/fasthttp` from 1.55.0 to 1.56.0
- [Release notes](https://github.com/valyala/fasthttp/releases)
- [Commits](valyala/fasthttp@v1.55.0...v1.56.0)

Updates `golang.org/x/term` from 0.23.0 to 0.25.0
- [Commits](golang/term@v0.23.0...v0.25.0)

---
updated-dependencies:
- dependency-name: github.com/knadh/koanf/providers/env
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: deps
- dependency-name: github.com/knadh/koanf/providers/file
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: deps
- dependency-name: github.com/valyala/fasthttp
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: deps
- dependency-name: golang.org/x/term
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: deps
...

Signed-off-by: dependabot[bot] <support@github.com>

* Chore(deps): Bump the deps group across 1 directory with 3 updates

Bumps the deps group with 3 updates in the / directory: [github.com/knadh/koanf/v2](https://github.com/knadh/koanf), [github.com/valyala/fasthttp](https://github.com/valyala/fasthttp) and [golang.org/x/term](https://github.com/golang/term).


Updates `github.com/knadh/koanf/v2` from 2.1.1 to 2.1.2
- [Release notes](https://github.com/knadh/koanf/releases)
- [Commits](knadh/koanf@v2.1.1...v2.1.2)

Updates `github.com/valyala/fasthttp` from 1.56.0 to 1.57.0
- [Release notes](https://github.com/valyala/fasthttp/releases)
- [Commits](valyala/fasthttp@v1.56.0...v1.57.0)

Updates `golang.org/x/term` from 0.25.0 to 0.26.0
- [Commits](golang/term@v0.25.0...v0.26.0)

---
updated-dependencies:
- dependency-name: github.com/knadh/koanf/v2
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: deps
- dependency-name: github.com/valyala/fasthttp
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: deps
- dependency-name: golang.org/x/term
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: deps
...

Signed-off-by: dependabot[bot] <support@github.com>

* Chore(deps): Bump the deps group across 1 directory with 3 updates

Bumps the deps group with 3 updates in the / directory: [github.com/fasthttp/router](https://github.com/fasthttp/router), [github.com/valyala/fasthttp](https://github.com/valyala/fasthttp) and [golang.org/x/term](https://github.com/golang/term).


Updates `github.com/fasthttp/router` from 1.5.2 to 1.5.3
- [Release notes](https://github.com/fasthttp/router/releases)
- [Commits](fasthttp/router@v1.5.2...v1.5.3)

Updates `github.com/valyala/fasthttp` from 1.57.0 to 1.58.0
- [Release notes](https://github.com/valyala/fasthttp/releases)
- [Commits](valyala/fasthttp@v1.57.0...v1.58.0)

Updates `golang.org/x/term` from 0.26.0 to 0.27.0
- [Commits](golang/term@v0.26.0...v0.27.0)

---
updated-dependencies:
- dependency-name: github.com/fasthttp/router
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: deps
- dependency-name: github.com/valyala/fasthttp
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: deps
- dependency-name: golang.org/x/term
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: deps
...

Signed-off-by: dependabot[bot] <support@github.com>

* Chore(deps): Bump wangyoucao577/go-release-action in the deps group

Bumps the deps group with 1 update: [wangyoucao577/go-release-action](https://github.com/wangyoucao577/go-release-action).


Updates `wangyoucao577/go-release-action` from 1.52 to 1.53
- [Release notes](https://github.com/wangyoucao577/go-release-action/releases)
- [Commits](wangyoucao577/go-release-action@v1.52...v1.53)

---
updated-dependencies:
- dependency-name: wangyoucao577/go-release-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: deps
...

Signed-off-by: dependabot[bot] <support@github.com>

* Chore(deps): Bump github.com/fasthttp/router in the deps group

Bumps the deps group with 1 update: [github.com/fasthttp/router](https://github.com/fasthttp/router).


Updates `github.com/fasthttp/router` from 1.5.3 to 1.5.4
- [Release notes](https://github.com/fasthttp/router/releases)
- [Commits](fasthttp/router@v1.5.3...v1.5.4)

---
updated-dependencies:
- dependency-name: github.com/fasthttp/router
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: deps
...

Signed-off-by: dependabot[bot] <support@github.com>

* Chore(deps): Bump golang.org/x/term in the deps group

Bumps the deps group with 1 update: [golang.org/x/term](https://github.com/golang/term).


Updates `golang.org/x/term` from 0.27.0 to 0.28.0
- [Commits](golang/term@v0.27.0...v0.28.0)

---
updated-dependencies:
- dependency-name: golang.org/x/term
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: deps
...

Signed-off-by: dependabot[bot] <support@github.com>

* Chore(deps): Bump the deps group across 1 directory with 2 updates

Bumps the deps group with 2 updates in the / directory: [github.com/valyala/fasthttp](https://github.com/valyala/fasthttp) and [golang.org/x/term](https://github.com/golang/term).


Updates `github.com/valyala/fasthttp` from 1.58.0 to 1.59.0
- [Release notes](https://github.com/valyala/fasthttp/releases)
- [Commits](valyala/fasthttp@v1.58.0...v1.59.0)

Updates `golang.org/x/term` from 0.28.0 to 0.29.0
- [Commits](golang/term@v0.28.0...v0.29.0)

---
updated-dependencies:
- dependency-name: github.com/valyala/fasthttp
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: deps
- dependency-name: golang.org/x/term
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: deps
...

Signed-off-by: dependabot[bot] <support@github.com>

* Chore(deps): Bump golang.org/x/term in the deps group

Bumps the deps group with 1 update: [golang.org/x/term](https://github.com/golang/term).


Updates `golang.org/x/term` from 0.29.0 to 0.30.0
- [Commits](golang/term@v0.29.0...v0.30.0)

---
updated-dependencies:
- dependency-name: golang.org/x/term
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: deps
...

Signed-off-by: dependabot[bot] <support@github.com>

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Lorenzo Sapora <25519274+LorenzoSapora@users.noreply.github.com>
Co-authored-by: Emil Eriksson <8700261+ginger51011@users.noreply.github.com>
Co-authored-by: Tim E <fowlmouth@users.noreply.github.com>
@yunginnanet
Chore: deps
8703a33
@yunginnanet
Fix: functioning toml serde
776d50d
@yunginnanet
CI: update workflow, run on all branches
4aca277 
(cherry picked from commit e74a9f78db5f6ff805924ba598ffea325a0d8f96)
Signed-off-by: kayos <kayos@tcp.direct>
@yunginnanet
CI: update workflow, run on all branches
e4bc51c 
(cherry picked from commit e74a9f78db5f6ff805924ba598ffea325a0d8f96)
Signed-off-by: kayos <kayos@tcp.direct>
@yunginnanet
Security: resolve gosec G115 (CWE-190)
34683d5 
(cherry picked from commit 5ff474a)
Signed-off-by: kayos <kayos@tcp.direct>
@yunginnanet
Security: resolve gosec G115 (CWE-190)
fe9f516
@yunginnanet
Fix[#199]: bump go version in Dockerfile
0257881 
(cherry picked from commit be3a7d8)
Signed-off-by: kayos <kayos@tcp.direct>
@yunginnanet yunginnanet force-pushed the main branch 7 times, most recently from 0fa2eea to 2da439c Compare July 2, 2025 23:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ginger51011 ginger51011 ginger51011 left review comments

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

code for cli help is a dumpster fire HellPot desperately needs test cases

2 participants

@yunginnanet @ginger51011