Added Syntax Highlighting for nftables-firewall config file #3325
+20
−0
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| filetype: nftables | ||
|
|
||
| detect: | ||
| filename: "nftables.conf$" | ||
| header: "^(#!.*/(env +)?nft( |$)|flush +ruleset)" | ||
|
|
||
| rules: | ||
| - type: "\\b(chain|counter|map|rule|ruleset|set|table)\\b" | ||
| - type: "\\b(ether|icmp|icmpv6|icmpx|inet|ip|ip6|ipv4|ipv6|tcp|udp)\\b" | ||
| - special: "\\b(elements|hook|policy|priority|type)\\b" | ||
| - identifier: "\\b(ct|iif|iifname|meta|oif|oifname|th)\\b" | ||
| - statement: "\\b(accept|drop|goto|jump|log|masquerade|reject)\\b" | ||
| - preproc: "\\b(add|define|flush|include|delete)\\b" | ||
| - symbol: "[-=/:;,@]" | ||
| - symbol.operator: "[<>.&|^!]|\\b(and|ge|gt|le|lt|or|xor)\\b" | ||
|
There was a problem hiding this comment. The Line 23 in 8c0e0fa Currently the |
||
| - constant.string: '([\"]{1})(.*)([\"]{1})' | ||
|
There was a problem hiding this comment. The string handling is broken and I recommend to use a region for this purpose, similar to: Lines 40 to 42 in 8c0e0fa |
||
| - identifier.var: "[$@][a-zA-Z_.][a-zA-Z0-9_/.-]*" | ||
| - comment: "(^|[[:space:]])#([^{].*)?$" | ||
| - indent-char.whitespace: "[[:space:]]+$" | ||
| - indent-char: " + +| + +" | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could be reduced to
i(cm)?p(x|(v?(4|6))?), but I'm unsure if it improves readability or regex compile time.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
i think not that this can be reduced, because of then would be things like chain, counter, map etc and tcp udp not highlighed.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Argh, sure...forget to fill up:
ether|inet|i(cm)?p(x|(v?(4|6))?)|tcp|udp🤦♂️There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I`ve added your suggestions, you can try if you want to. If i should build it for you, please answer me, then i will build it and create a little release for you.
But you can clone the Repo, and do the described manual build. (Don`t forget to install golang before)
https://github.com/theredcmdcraft/micro/tree/nftables-improvements
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I doubt @JoeKar needs help with that. He is a maintainer of micro.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oops. I didn`t see the Collaborator Symbol on the right side.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No problem, it was my fault not testing it earlier at work were we've some good examples of nftable rules. It was still on my todo before it was merged.
Ok, anyway...since this merge request is already merged we should create a new one to properly add the fixes into the
nftables.yaml.I suggest to do the following (after the "upstream" is available in your private fork too):
git check nftables-improvements git fetch --all git reset HEAD~1 git stash git reset --hard upstream/master git stash apply git stash add runtime/syntax/nftables.yaml git commit -m "Added Suggested changes" git push --force-with-leaseCreate from this resulting branch (nftables-improvements) in your fork a new pull request to to our upstream repository. Sure you can follow your own approach to create a new clean PR.
Currently I've some doubts that the changed
symbolandconstant.stringwill work as expected.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Did i have to do these steps, when i synced my repo with this repo? I Synced the Fork, and then i created a new branch from the master branch, where i did the changes yesterday. Or can i simply create a new PR with my newly created branch as source. The Target is the micro master branch.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sure, you can use a fully new/clean branch derived from the synced master to publish your changes within a new PR.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The new PR is #3517