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

vyos.template: T3664: use a module-level global variable for the default template directory (backport #3415) #3416

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 6, 2024

Change Summary

Use a module-level global variable for the default template directory as a more convenient and secure alternative to environment variable. It appears to propagate correctly. This removes the concern about malicious users injecting stuff into scripts on a live system by changing the environment variables.

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Code style update (formatting, renaming)
  • Refactoring (no functional changes)
  • Migration from an old Vyatta component to vyos-1x, please link to related PR inside obsoleted component
  • Other (please describe): internal change.

Related Task(s)

Related PR(s)

Component(s) name

vyos.template

Checklist:

  • I have read the CONTRIBUTING document
  • I have linked this PR to one or more Phabricator Task(s)
  • I have run the components SMOKETESTS if applicable
  • My commit headlines contain a valid Task id
  • My change requires a change to the documentation
  • I have updated the documentation accordingly

This is an automatic backport of pull request #3415 done by [Mergify](https://mergify.com).

…ult template directory

as a more convenient and secure alternative to environment variable

(cherry picked from commit 9aa8c3c)

# Conflicts:
#	python/vyos/template.py
@mergify mergify bot added the conflicts label May 6, 2024
Copy link
Contributor Author

mergify bot commented May 6, 2024

Cherry-pick of 9aa8c3c has failed:

On branch mergify/bp/sagitta/pr-3415
Your branch is up to date with 'origin/sagitta'.

You are currently cherry-picking commit 9aa8c3cd9.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   python/vyos/template.py

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Development

Successfully merging this pull request may close these issues.

1 participant