Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement rfc6587 auto detection #154

Merged
merged 13 commits into from
Dec 4, 2024

Conversation

bazsi
Copy link
Member

@bazsi bazsi commented Jun 9, 2024

This is a pretty common misconfiguration that should be handled automatically.

Just use syslog(transport(auto)) to automatically accept both octet counted and non-octet counted connections, this opens a TCP port without TLS, meaning it is an implementation of RFC6587.

lib/logproto/logproto-auto-server.c Outdated Show resolved Hide resolved
news/feature-4814.md Outdated Show resolved Hide resolved
@bazsi bazsi force-pushed the implement-rfc6587-auto-detection branch from 98435b3 to c728d0a Compare June 22, 2024 07:18
@bazsi bazsi force-pushed the implement-rfc6587-auto-detection branch from c728d0a to 902b563 Compare July 16, 2024 07:52
@bazsi bazsi force-pushed the implement-rfc6587-auto-detection branch from 902b563 to 6c992ba Compare August 10, 2024 15:26
@MrAnno MrAnno self-requested a review August 10, 2024 19:28
@bazsi
Copy link
Member Author

bazsi commented Sep 18, 2024

This should wait until #156 is merged.

@bazsi bazsi force-pushed the implement-rfc6587-auto-detection branch from 6c992ba to e87919d Compare October 16, 2024 13:46
@bazsi bazsi changed the title Implement rfc6587 auto detection WIP: Implement rfc6587 auto detection Oct 16, 2024
@bazsi
Copy link
Member Author

bazsi commented Oct 16, 2024

I have now rebased it but still need to check if it works on top of #156

@bazsi bazsi force-pushed the implement-rfc6587-auto-detection branch from e87919d to 85788fb Compare October 24, 2024 01:37
@alltilla
Copy link
Member

#156 is now merged, I think we can give this another go (rebase, CI, review, ...)

@alltilla alltilla self-requested a review October 24, 2024 08:44
@bazsi bazsi force-pushed the implement-rfc6587-auto-detection branch from 85788fb to 7fcd8d2 Compare November 2, 2024 20:33
@bazsi bazsi force-pushed the implement-rfc6587-auto-detection branch 2 times, most recently from eec5d17 to 09b5751 Compare November 8, 2024 07:50
@bazsi bazsi changed the title WIP: Implement rfc6587 auto detection Implement rfc6587 auto detection Nov 8, 2024
@bazsi
Copy link
Member Author

bazsi commented Nov 8, 2024

This should now be ready for review.

Note: there's a followup PR as well, #361

@bazsi bazsi force-pushed the implement-rfc6587-auto-detection branch 2 times, most recently from 6ab04f3 to 594de7b Compare November 9, 2024 20:46
@bazsi
Copy link
Member Author

bazsi commented Nov 9, 2024

I have now opted out of doing this by default. The auto-detection mechanism is only enabled with transport(auto)

@bazsi bazsi force-pushed the implement-rfc6587-auto-detection branch from 594de7b to ba0325e Compare November 9, 2024 20:51
Copy link
Contributor

github-actions bot commented Nov 9, 2024

This Pull Request introduces config grammar changes

axoflow/9d25570002aaa3c97d7275d119270bd68a6b45d2 -> bazsi/implement-rfc6587-auto-detection

--- a/destination
+++ b/destination

 network(
     transport(
+        auto
     )
 )

 syslog(
     transport(
+        auto
     )
 )

--- a/source
+++ b/source

 network(
     transport(
+        auto
     )
 )

 syslog(
     transport(
+        auto
     )
 )

@bazsi bazsi force-pushed the implement-rfc6587-auto-detection branch from ba0325e to fa94fef Compare November 11, 2024 19:51
@MrAnno
Copy link
Member

MrAnno commented Nov 11, 2024

I've started reviewing this patchset, will finish it by the end of the week.

@bazsi bazsi changed the title Implement rfc6587 auto detection WIP: Implement rfc6587 auto detection Nov 12, 2024
@OverOrion OverOrion self-requested a review December 2, 2024 12:54
Copy link
Contributor

@OverOrion OverOrion left a comment

Choose a reason for hiding this comment

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

I've reviewed this and tested it manually as well, worked just fine 🚀.
Is there a reason why it's still marked as WIP?

@bazsi bazsi force-pushed the implement-rfc6587-auto-detection branch from fa94fef to 6e2ae10 Compare December 3, 2024 12:36
bazsi added 9 commits December 3, 2024 18:03
This is just the change in test code, which adds LogProtoServer ** arguments
to the handshake related functions, in order to allow
log_proto_server_handshake to change the LogProto instance.

Signed-off-by: Balazs Scheidler <[email protected]>
This can be used to simplify LogProtoAutoServer.

Signed-off-by: Balazs Scheidler <[email protected]>
Signed-off-by: Balazs Scheidler <[email protected]>
@bazsi bazsi force-pushed the implement-rfc6587-auto-detection branch from 6e2ae10 to 25d6834 Compare December 3, 2024 17:15
@bazsi bazsi changed the title WIP: Implement rfc6587 auto detection Implement rfc6587 auto detection Dec 3, 2024
@bazsi
Copy link
Member Author

bazsi commented Dec 3, 2024

I pulled some of the later commits into this one, rebased against main and removed WIP.

@OverOrion if you can please re-approve, but note that I did pull in some newer changes into this.

@MrAnno MrAnno removed their request for review December 3, 2024 22:55
Copy link
Contributor

@OverOrion OverOrion left a comment

Choose a reason for hiding this comment

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

Thank you! 🚀

@OverOrion OverOrion merged commit f9d59b3 into axoflow:main Dec 4, 2024
22 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants