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

Fix SCL block parameter substitution #2901

Merged
merged 1 commit into from
Sep 16, 2019

Conversation

MrAnno
Copy link
Collaborator

@MrAnno MrAnno commented Sep 2, 2019

After a quoted character, transitioning into CLS_WITHIN_STRING is not
enough, because another quote or "string end" character may follow.

Here is the state machine of _track_string_state(), the red lines were missing.

string_state

Fixes #2879

After a quoted character, transitioning into CLS_WITHIN_STRING is not
enough, because another quote or "string end" character may follow.

Signed-off-by: László Várady <laszlo.varady93@gmail.com>
@MrAnno
Copy link
Collaborator Author

MrAnno commented Sep 2, 2019

@jszigetvari Could you try this patch with your original config, please?

@MrAnno MrAnno added this to the syslog-ng-3.24 milestone Sep 2, 2019
@kira-syslogng
Copy link
Contributor

Build SUCCESS

@MrAnno
Copy link
Collaborator Author

MrAnno commented Sep 2, 2019

@kira-syslogng retest this please

@kira-syslogng
Copy link
Contributor

Build SUCCESS

@jszigetvari
Copy link
Contributor

@MrAnno As far as I could check, my test config, that produced the error eariler now passes the syntax validation.

@MrAnno
Copy link
Collaborator Author

MrAnno commented Sep 6, 2019

@jszigetvari Thanks for the test!

Copy link
Collaborator

@alltilla alltilla left a comment

Choose a reason for hiding this comment

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

Nice catch!

@MrAnno
Copy link
Collaborator Author

MrAnno commented Sep 15, 2019

@kira-syslogng retest this please

@kira-syslogng
Copy link
Contributor

Build SUCCESS

@gaborznagy gaborznagy merged commit 67fe2b0 into syslog-ng:master Sep 16, 2019
MrAnno added a commit to MrAnno/syslog-ng that referenced this pull request Oct 19, 2019
After fixing the SCL parameter substitution in syslog-ng#2901, the Telegram
destination has stopped working.

The type of the use-system-cert-store() option should be yes/no,
strings are not accepted.

Signed-off-by: László Várady <laszlo.varady@protonmail.com>
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.

SCL block parsing problem
5 participants