Skip to content
Merged
Show file tree
Hide file tree
Changes from 11 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion resources/sshdconfig/locales/en-us.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ set = "Set command: '%{input}'"
[parser]
failedToParse = "failed to parse: '%{input}'"
failedToParseAsArray = "value is not an array"
failedToParseChildNode = "failed to parse child node: '%{input}'"
failedToParseNode = "failed to parse '%{input}'"
failedToParseRoot = "failed to parse root: '%{input}'"
invalidConfig = "invalid config: '%{input}'"
Expand All @@ -42,8 +41,10 @@ invalidValue = "operator is an invalid value for node"
keyNotFound = "key '%{key}' not found"
keyNotRepeatable = "key '%{key}' is not repeatable"
keywordDebug = "Parsing keyword: '%{text}'"
missingCriteriaInMatch = "missing criteria field in match block: '%{input}'"
missingValueInChildNode = "missing value in child node: '%{input}'"
missingKeyInChildNode = "missing key in child node: '%{input}'"
noArgumentsFound = "no arguments found in node: '%{input}'"
valueDebug = "Parsed argument value:"
unknownNode = "unknown node: '%{kind}'"
unknownNodeType = "unknown node type: '%{node}'"
Expand Down
11 changes: 8 additions & 3 deletions resources/sshdconfig/src/metadata.rs
Original file line number Diff line number Diff line change
@@ -1,14 +1,19 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.

// keywords that can have multiple arguments per line but cannot be repeated over multiple lines,
// keywords that can have multiple comma-separated arguments per line but cannot be repeated over multiple lines,
// as subsequent entries are ignored, should be represented as arrays
pub const MULTI_ARG_KEYWORDS: [&str; 17] = [
pub const MULTI_ARG_KEYWORDS: [&str; 22] = [
"acceptenv",
"allowgroups",
"allowusers",
"authenticationmethods",
"authorizedkeysfile",
"casignaturealgorithms",
"channeltimeout",
"ciphers",
"denygroups",
"denyusers",
"hostbasedacceptedalgorithms",
"hostkeyalgorithms",
"ipqos",
Expand All @@ -24,7 +29,7 @@ pub const MULTI_ARG_KEYWORDS: [&str; 17] = [
];

// keywords that can be repeated over multiple lines and should be represented as arrays.
// note that some keywords can be both multi-arg and repeatable, in which case they only need to be listed here
// note that some keywords can be both multi-arg and repeatable
pub const REPEATABLE_KEYWORDS: [&str; 12] = [
"acceptenv",
"allowgroups",
Expand Down
Loading
Loading