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.

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

Jump to bottom

fix: Stop chowning in tedge-agent #3148

Merged
merged 1 commit into from
Oct 2, 2024
Merged

fix: Stop chowning in tedge-agent #3148

Show file tree
Hide file tree
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
1 change: 0 additions & 1 deletion Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions crates/extensions/tedge_config_manager/src/actor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,8 +335,7 @@ impl ConfigManagerWorker {
return Err(anyhow::anyhow!("tedge_url not present in config update payload").into());
};

let download_request = DownloadRequest::new(tedge_url, temp_path.as_std_path())
.with_permission(file_entry.file_permissions.to_owned());
let download_request = DownloadRequest::new(tedge_url, temp_path.as_std_path());

info!(
"Awaiting download for config type: {} from url: {}",
Expand Down
1 change: 0 additions & 1 deletion crates/extensions/tedge_downloader_ext/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ mockito = { workspace = true }
tedge_test_utils = { workspace = true }
tokio = { workspace = true, default_features = false, features = ["time"] }
uzers = { workspace = true }
whoami = { workspace = true }

[lints]
workspace = true
7 changes: 0 additions & 7 deletions crates/extensions/tedge_downloader_ext/src/actor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,6 @@ impl DownloadRequest {
..self
}
}

pub fn with_permission(self, permission: PermissionEntry) -> Self {
Self {
permission: Some(permission),
..self
}
}
}

pub type DownloadResult = Result<DownloadResponse, DownloadError>;
Expand Down
38 changes: 0 additions & 38 deletions crates/extensions/tedge_downloader_ext/src/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ use download::Auth;
use std::time::Duration;
use tedge_actors::ClientMessageBox;
use tedge_test_utils::fs::TempTedgeDir;
use tedge_utils::file::PermissionEntry;
use tokio::time::timeout;

const TEST_TIMEOUT: Duration = Duration::from_secs(5);
Expand Down Expand Up @@ -71,43 +70,6 @@ async fn download_with_auth() {
assert_eq!(response.as_ref().unwrap().url, server_url);
}

#[tokio::test]
async fn download_with_permission() {
let ttd = TempTedgeDir::new();
let mut server = mockito::Server::new();
let _mock = server
.mock("GET", "/")
.with_status(200)
.with_header("content-type", "text/plain")
.with_body("without auth")
.create();

let target_path = ttd.path().join("downloaded_file");
let server_url = server.url();
let user = whoami::username();
let group = uzers::get_current_groupname()
.unwrap()
.into_string()
.unwrap();

let download_request = DownloadRequest::new(&server_url, &target_path)
.with_permission(PermissionEntry::new(Some(user), Some(group), Some(0o775)));

let mut requester = spawn_downloader_actor().await;

let (id, response) = timeout(
TEST_TIMEOUT,
requester.await_response(("id".to_string(), download_request)),
)
.await
.expect("timeout")
.expect("channel error");

assert_eq!(id.as_str(), "id");
assert_eq!(response.as_ref().unwrap().file_path, target_path.as_path());
assert_eq!(response.as_ref().unwrap().url, server_url);
}

async fn spawn_downloader_actor(
) -> ClientMessageBox<(String, DownloadRequest), (String, DownloadResult)> {
let mut downloader_actor_builder =
Expand Down
1 change: 1 addition & 0 deletions tests/RobotFramework/tests/cumulocity/configuration/config-root.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"name":"configuration1"}
21 changes: 21 additions & 0 deletions tests/RobotFramework/tests/cumulocity/configuration/configuration_operation.robot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ Set Configuration when file does not exist
Binary file (Main Device) ${PARENT_SN} ${PARENT_SN} CONFIG1_BINARY /etc/binary-config1.tar.gz ${CURDIR}/binary-config1.tar.gz 640 tedge:tedge delete_file_before=${true}
Text file (Child Device) ${CHILD_SN} ${PARENT_SN}:device:${CHILD_SN} CONFIG1 /etc/config1.json ${CURDIR}/config1-version2.json 640 tedge:tedge delete_file_before=${true}
Binary file (Child Device) ${CHILD_SN} ${PARENT_SN}:device:${CHILD_SN} CONFIG1_BINARY /etc/binary-config1.tar.gz ${CURDIR}/binary-config1.tar.gz 640 tedge:tedge delete_file_before=${true}
Root-owned file (Main Device) ${PARENT_SN} ${PARENT_SN} CONFIG-ROOT /etc/config-root.json ${CURDIR}/config-root.json 600 root:root delete_file_before=${true}
Root-owned file (Child Device) ${CHILD_SN} ${PARENT_SN}:device:${CHILD_SN} CONFIG-ROOT /etc/config-root.json ${CURDIR}/config-root.json 600 root:root delete_file_before=${true}

Set Configuration when file exists and agent run normally
[Documentation] If the configuration file already exists, it should be overwritten, but owner and permissions
Expand All @@ -39,6 +41,8 @@ Set Configuration when file exists and agent run normally
Binary file (Main Device) ${PARENT_SN} ${PARENT_SN} CONFIG1_BINARY /etc/binary-config1.tar.gz ${CURDIR}/binary-config1.tar.gz 664 root:root delete_file_before=${false}
Text file (Child Device) ${CHILD_SN} ${PARENT_SN}:device:${CHILD_SN} CONFIG1 /etc/config1.json ${CURDIR}/config1-version2.json 664 root:root delete_file_before=${false}
Binary file (Child Device) ${CHILD_SN} ${PARENT_SN}:device:${CHILD_SN} CONFIG1_BINARY /etc/binary-config1.tar.gz ${CURDIR}/binary-config1.tar.gz 664 root:root delete_file_before=${false}
Root-owned file (Main Device) ${PARENT_SN} ${PARENT_SN} CONFIG-ROOT /etc/config-root.json ${CURDIR}/config-root.json 600 root:root delete_file_before=${false}
Root-owned file (Child Device) ${CHILD_SN} ${PARENT_SN}:device:${CHILD_SN} CONFIG-ROOT /etc/config-root.json ${CURDIR}/config-root.json 600 root:root delete_file_before=${true}

Set Configuration when file exists and tedge run by root
[Documentation] If the configuration file already exists, it should be overwritten, but owner and permissions
Expand All @@ -53,6 +57,10 @@ Set Configuration when file exists and tedge run by root
... agent_as_root=${true}
Binary file (Child Device) ${CHILD_SN} ${PARENT_SN}:device:${CHILD_SN} CONFIG1_BINARY /etc/binary-config1.tar.gz ${CURDIR}/binary-config1.tar.gz 664 root:root delete_file_before=${false}
... agent_as_root=${true}
Root-owned file (Main Device) ${PARENT_SN} ${PARENT_SN} CONFIG-ROOT /etc/config-root.json ${CURDIR}/config-root.json 600 root:root delete_file_before=${true}
... agent_as_root=${true}
Root-owned file (Child Device) ${CHILD_SN} ${PARENT_SN}:device:${CHILD_SN} CONFIG-ROOT /etc/config-root.json ${CURDIR}/config-root.json 600 root:root delete_file_before=${true}
... agent_as_root=${true}

Set Configuration when tedge-write is in another location
[Template] Set Configuration from Device with tedge-write at another location
Expand Down Expand Up @@ -433,6 +441,7 @@ Update configuration plugin config via cloud
... /etc/tedge/tedge.toml
... system.toml
... CONFIG1
... CONFIG-ROOT
... CONFIG1_BINARY
${config_url}= Cumulocity.Create Inventory Binary
... tedge-configuration-plugin
Expand All @@ -445,6 +454,7 @@ Update configuration plugin config via cloud
... /etc/tedge/tedge.toml
... system.toml
... CONFIG1
... CONFIG-ROOT
... Config@2.0.0

Modify configuration plugin config via local filesystem modify inplace
Expand All @@ -456,6 +466,7 @@ Modify configuration plugin config via local filesystem modify inplace
... /etc/tedge/tedge.toml
... system.toml
... CONFIG1
... CONFIG-ROOT
... CONFIG1_BINARY
ThinEdgeIO.Set Device Context ${device}
ThinEdgeIO.Execute Command sed -i 's/CONFIG1/CONFIG3/g' /etc/tedge/plugins/tedge-configuration-plugin.toml
Expand All @@ -465,6 +476,7 @@ Modify configuration plugin config via local filesystem modify inplace
... system.toml
... CONFIG3
... CONFIG3_BINARY
... CONFIG-ROOT
${operation}= Cumulocity.Get Configuration CONFIG3
Operation Should Be SUCCESSFUL ${operation}

Expand All @@ -479,6 +491,7 @@ Modify configuration plugin config via local filesystem overwrite
... system.toml
... CONFIG1
... CONFIG1_BINARY
... CONFIG-ROOT
${NEW_CONFIG}= ThinEdgeIO.Execute Command
... sed 's/CONFIG1/CONFIG3/g' /etc/tedge/plugins/tedge-configuration-plugin.toml
ThinEdgeIO.Execute Command echo "${NEW_CONFIG}" > /etc/tedge/plugins/tedge-configuration-plugin.toml
Expand All @@ -488,6 +501,7 @@ Modify configuration plugin config via local filesystem overwrite
... system.toml
... CONFIG3
... CONFIG3_BINARY
... CONFIG-ROOT
${operation}= Cumulocity.Get Configuration CONFIG3
Operation Should Be SUCCESSFUL ${operation}

Expand All @@ -502,6 +516,7 @@ Update configuration plugin config via local filesystem copy
... system.toml
... CONFIG1
... CONFIG1_BINARY
... CONFIG-ROOT
Transfer To Device ${CURDIR}/tedge-configuration-plugin-updated.toml /etc/tedge/plugins/
Execute Command
... cp /etc/tedge/plugins/tedge-configuration-plugin-updated.toml /etc/tedge/plugins/tedge-configuration-plugin.toml
Expand All @@ -511,6 +526,7 @@ Update configuration plugin config via local filesystem copy
... system.toml
... CONFIG1
... Config@2.0.0
... CONFIG-ROOT
${operation}= Cumulocity.Get Configuration Config@2.0.0
Operation Should Be SUCCESSFUL ${operation}

Expand All @@ -524,6 +540,7 @@ Update configuration plugin config via local filesystem move (different director
... /etc/tedge/tedge.toml
... system.toml
... CONFIG1
... CONFIG-ROOT
... CONFIG1_BINARY
Transfer To Device ${CURDIR}/tedge-configuration-plugin-updated.toml /etc/
Execute Command
Expand All @@ -533,6 +550,8 @@ Update configuration plugin config via local filesystem move (different director
... /etc/tedge/tedge.toml
... system.toml
... CONFIG1
... CONFIG-ROOT

... Config@2.0.0
${operation}= Cumulocity.Get Configuration Config@2.0.0
Operation Should Be SUCCESSFUL ${operation}
Expand All @@ -547,6 +566,7 @@ Update configuration plugin config via local filesystem move (same directory)
... /etc/tedge/tedge.toml
... system.toml
... CONFIG1
... CONFIG-ROOT
... CONFIG1_BINARY
Transfer To Device ${CURDIR}/tedge-configuration-plugin-updated.toml /etc/tedge/plugins/
Execute Command
Expand All @@ -556,6 +576,7 @@ Update configuration plugin config via local filesystem move (same directory)
... /etc/tedge/tedge.toml
... system.toml
... CONFIG1
... CONFIG-ROOT
... Config@2.0.0
${operation}= Cumulocity.Get Configuration Config@2.0.0
Operation Should Be SUCCESSFUL ${operation}
Expand Down
4 changes: 4 additions & 0 deletions ...obotFramework/tests/cumulocity/configuration/configuration_with_file_transfer_https.robot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ Update Configuration Should Fail
... system.toml
... CONFIG1
... CONFIG1_BINARY
... CONFIG-ROOT
${config_url}= Cumulocity.Create Inventory Binary
... tedge-configuration-plugin
... tedge-configuration-plugin
Expand All @@ -128,6 +129,7 @@ Update Configuration Should Fail
... system.toml
... CONFIG1
... CONFIG1_BINARY
... CONFIG-ROOT

Update Configuration Should Succeed
[Arguments] ${external_id}
Expand All @@ -138,6 +140,7 @@ Update Configuration Should Succeed
... system.toml
... CONFIG1
... CONFIG1_BINARY
... CONFIG-ROOT
${config_url}= Cumulocity.Create Inventory Binary
... tedge-configuration-plugin
... tedge-configuration-plugin
Expand All @@ -149,6 +152,7 @@ Update Configuration Should Succeed
... /etc/tedge/tedge.toml
... system.toml
... CONFIG1
... CONFIG-ROOT
... Config@2.0.0

Enable Certificate Authentication for File Transfer Service
Expand Down
3 changes: 2 additions & 1 deletion tests/RobotFramework/tests/cumulocity/configuration/tedge-configuration-plugin-updated.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@ files = [
{ path = '/etc/tedge/system.toml', type = 'system.toml', user = 'tedge', group = 'tedge', mode = 0o444 },
{ path = '/etc/config1.json', type = 'CONFIG1', user = 'tedge', group = 'tedge', mode = 0o444 },
{ path = '/etc/config2.json', type = 'Config@2.0.0', user = 'tedge', group = 'tedge', mode = 0o444 },
]
{ path = '/etc/config-root.json', type = 'CONFIG-ROOT', user = 'root', group = 'root', mode = 0o600 },
]
3 changes: 2 additions & 1 deletion tests/RobotFramework/tests/cumulocity/configuration/tedge-configuration-plugin.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@ files = [
{ path = '/etc/tedge/system.toml', type = 'system.toml', user = 'tedge', group = 'tedge', mode = 0o444 },
{ path = '/etc/config1.json', type = 'CONFIG1', user = 'tedge', group = 'tedge', mode = 0o640 },
{ path = '/etc/binary-config1.tar.gz', type = 'CONFIG1_BINARY', user = 'tedge', group = 'tedge', mode = 0o640 },
]
{ path = '/etc/config-root.json', type = 'CONFIG-ROOT', user = 'root', group = 'root', mode = 0o600 },
]