Skip to content

fix: initialize self.tok on sub-proxies to prevent AttributeError [fj4WqyCCw3C5ShR1RfB7MoBPTpkRrBFYP1uT35g3MvT] #70073

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.

Sign up for GitHub

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

Closed
waterWang wants to merge 1 commit into from
+6 −0
Closed

fix: initialize self.tok on sub-proxies to prevent AttributeError [fj4WqyCCw3C5ShR1RfB7MoBPTpkRrBFYP1uT35g3MvT] #70073

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions salt/metaproxy/deltaproxy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,6 +463,12 @@ async def subproxy_post_master_init(minion_id, uid, opts, main_proxy, main_utils
)

_proxy_minion = ProxyMinion(proxyopts)
# Sub-proxies never run connect_master, so self.tok
# is never set by the usual master-connection path.
# Initialize to None to prevent AttributeError in
# paths that reference self.tok. The tok is
# regenerated by the channel layer on send anyway.
_proxy_minion.tok = None
_proxy_minion.proc_dir = salt.minion.get_proc_dir(proxyopts["cachedir"], uid=uid)

# And load the modules
Expand Down