cmds.secrets.CompileTemplates: Fix conf line handling #138

Merged

Jan Lindemann merged 1 commit from jan/fix/20261012-cmds-secrets-compiletemplates-fix-conf-line-handling into master 2026-10-12 16:43:17 +02:00 AGit

Conversation 0 Commits 1 Files changed 4 +38 -22

Jan Lindemann commented 2026-10-12 10:37:22 +02:00

Owner

• Copy link
• Copy Markdown

cmds.secrets.CompileTemplates: Fix conf line handling

File attributes of the compiled output of jw-pkg secrets compile-templates can be specified via the # conf line atop a .jw-tmpl file, the parsing of that line is buggy, however.

Its mode is parsed as a decimal number unless it carries a leading zero, so mode=640 yields 640 decimal, 1200 octal, and the output file ends up without usable permissions. The same decimal parse applies to a conf line atop the .jw-secret of a target, whose attributes are honored the same way, and the --mode option of compile-templates passes its string value through to Attrs, whose mode is typed int, so a target without a conf line of its own crashes in _format_metadata().

Other than that, the # conf line itself should be removed from the compiled output, but isn't.

This commit makes the conf line handling correct:

• _parse_attributes() parses the mode as octal, with or without a leading zero
• _compile_one_template_file() drops the conf line from the compiled content
• the --mode option is converted to an octal int by octal_mode() at the argument boundary

The integration test writes its conf line modes without leading zeros, expects the conf line gone from the compiled output, takes one target's mode from a conf line atop its .jw-secret, and passes a --mode that the conf lines override.

#### cmds.secrets.CompileTemplates: Fix conf line handling File attributes of the compiled output of `jw-pkg secrets compile-templates` can be specified via the # conf line atop a `.jw-tmpl` file, the parsing of that line is buggy, however. Its mode is parsed as a decimal number unless it carries a leading zero, so `mode=640` yields 640 decimal, 1200 octal, and the output file ends up without usable permissions. The same decimal parse applies to a conf line atop the `.jw-secret` of a target, whose attributes are honored the same way, and the `--mode` option of compile-templates passes its string value through to Attrs, whose mode is typed int, so a target without a conf line of its own crashes in `_format_metadata()`. Other than that, the # conf line itself should be removed from the compiled output, but isn't. This commit makes the conf line handling correct: - `_parse_attributes()` parses the mode as octal, with or without a leading zero - `_compile_one_template_file()` drops the conf line from the compiled content - the `--mode` option is converted to an octal int by `octal_mode()` at the argument boundary The integration test writes its conf line modes without leading zeros, expects the conf line gone from the compiled output, takes one target's mode from a conf line atop its `.jw-secret`, and passes a `--mode` that the conf lines override.

Jan Lindemann added 1 commit 2026-10-12 10:37:22 +02:00

cmds.secrets.CompileTemplates: Fix conf line handling ... 609b3dcf9d

File attributes of the compiled output of "jw-pkg secrets
compile-templates" can be specified via the # conf line atop a .jw-tmpl
file, the parsing of that line is buggy, however.

Its mode is parsed as a decimal number unless it carries a leading zero, so
"mode=640" yields 640 decimal, 1200 octal, and the output file ends up
without usable permissions.  The same decimal parse applies to a conf line atop
the .jw-secret of a target, whose attributes are honored the same way, and
the --mode option of compile-templates passes its string value through to
Attrs, whose mode is typed int, so a target without a conf line of its own
crashes in _format_metadata().

Other than that, the # conf line itself should be removed from the compiled
output, but isn't.

This commit makes the conf line handling correct:

- _parse_attributes() parses the mode as octal, with or without a leading
  zero
- _compile_one_template_file() drops the conf line from the compiled
  content
- the --mode option is converted to an octal int by octal_mode() at the
  argument boundary

The integration test writes its conf line modes without leading zeros,
expects the conf line gone from the compiled output, takes one target's
mode from a conf line atop its .jw-secret, and passes a --mode that the
conf lines override.

Assisted-by: unsloth/Qwen3.8-27B-GGUF:Q4_K_M with pi.dev v1.1.0
Signed-off-by: Jan Lindemann <jan@janware.com>

Jan Lindemann scheduled this pull request to auto merge when all checks succeed 2026-10-12 10:37:23 +02:00

Jan Lindemann force-pushed jan/fix/20261012-cmds-secrets-compiletemplates-fix-conf-line-handling from 609b3dcf9d to 141dd0ac3c 2026-10-12 10:58:48 +02:00 Compare

Jan Lindemann scheduled this pull request to auto merge when all checks succeed 2026-10-12 16:35:05 +02:00

Jan Lindemann merged commit 141dd0ac3c into master 2026-10-12 16:43:17 +02:00

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels

No items

No labels

Milestone

Clear milestone

No items

No milestone

Assignees

Clear assignees

No assignees

1 participant

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set

Reference

janware/jw-pkg!138

No description provided.