Portainer
/
portainer
mirror of https://github.com/portainer/portainer.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(agent): add agent header [EE-2433] (#6484) 

* fix(agent): add agent header [EE-2433]

fix [EE-2433]

* fix(containers): reload current endpoint id
pull/6511/head
Chaim Lev-Ari 2022-02-01 09:37:12 +02:00 committed by GitHub
parent cb804e8813
commit 7d91ab72e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/docker/services/containerService.js
View File

@ -199,8 +199,10 @@ function ContainerServiceFactory($q, Container, LogHelper, $timeout, EndpointPro
return service; return service;
function withEndpointId(func) { function withEndpointId(func) {
return function (...args) {
const endpointId = EndpointProvider.endpointID(); const endpointId = EndpointProvider.endpointID();
return func.bind(null, endpointId); return func(endpointId, ...args);
};
} }
} }

11
app/portainer/services/axios.ts
View File

@ -13,13 +13,11 @@ const axiosApiInstance = axios.create({ baseURL: 'api' });
export default axiosApiInstance; export default axiosApiInstance;
axiosApiInstance.interceptors.request.use(async (config) => { axiosApiInstance.interceptors.request.use(async (config) => {
const newConfig = { ...config }; const newConfig = { headers: config.headers || {}, ...config };
const jwt = localStorageGet('JWT', ''); const jwt = localStorageGet('JWT', '');
if (jwt) { if (jwt) {
newConfig.headers = { newConfig.headers.Authorization = `Bearer ${jwt}`;
Authorization: `Bearer ${jwt}`,
};
} }
return newConfig; return newConfig;
@ -31,8 +29,11 @@ export function agentInterceptor(config: AxiosRequestConfig) {
} }
const newConfig = { headers: config.headers || {}, ...config }; const newConfig = { headers: config.headers || {}, ...config };
const target = portainerAgentTargetHeader();
if (target) {
newConfig.headers['X-PortainerAgent-Target'] = target;
}
newConfig.headers['X-PortainerAgent-Target'] = portainerAgentTargetHeader();
if (portainerAgentManagerOperation()) { if (portainerAgentManagerOperation()) {
newConfig.headers['X-PortainerAgent-ManagerOperation'] = '1'; newConfig.headers['X-PortainerAgent-ManagerOperation'] = '1';
} }