Skip to content

Fix about links #459

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

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fix about links #459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c9b5895
optimize get_user_id, get_user_id_effective and get_username_from_uid
ygerlach Oct 5, 2025
5bdcc05
let xdg_open drop the root user automatically
ygerlach Oct 5, 2025
e6d8d66
use xdg_open to open links in about dialog
ygerlach Oct 5, 2025
a8bbe64
remove unused user functions
ygerlach Oct 5, 2025
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
3 changes: 3 additions & 0 deletions src/Gtk/MainWindow.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -933,6 +933,9 @@ class MainWindow : Gtk.Window{
dialog.set_license_type(Gtk.License.GPL_2_0);
dialog.set_website_label("https://github.com/linuxmint/timeshift");
dialog.set_website("https://github.com/linuxmint/timeshift");

// this overwrites the default behaviour of About Dialog
dialog.activate_link.connect(TeeJee.System.xdg_open);
dialog.run();
dialog.destroy();
}
Expand Down
128 changes: 28 additions & 100 deletions src/Utility/TeeJee.System.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,109 +46,28 @@ namespace TeeJee.System{
return int.parse(pkexec_uid);
}

string sudo_user = GLib.Environment.get_variable("SUDO_USER");
string sudo_user = GLib.Environment.get_variable("SUDO_UID");

if (sudo_user != null){
return get_user_id_from_username(sudo_user);
return int.parse(sudo_user);
}

return get_user_id_effective(); // normal user
}

private int euid = -1; // cache for get_user_id_effective (its never going to change)
public int get_user_id_effective(){

// returns effective user id (0 for applications executed with sudo and pkexec)

int uid = -1;
string cmd = "id -u";
string std_out, std_err;
exec_sync(cmd, out std_out, out std_err);
if ((std_out != null) && (std_out.length > 0)){
uid = int.parse(std_out);
Comment on lines -61 to -67
Copy link
Contributor Author

@ygerlach ygerlach Oct 6, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

grafik

This subprocess could have been a syscall

if (euid < 0) {
euid = (int) Posix.geteuid();
}

return uid;
return euid;
}

public string get_username(){

// returns actual username of current user (even for applications executed with sudo and pkexec)

return get_username_from_uid(get_user_id());
}

public string get_username_effective(){

// returns effective user id ('root' for applications executed with sudo and pkexec)

return get_username_from_uid(get_user_id_effective());
}

public int get_user_id_from_username(string username){

// check local user accounts in /etc/passwd -------------------

foreach(var line in file_read("/etc/passwd").split("\n")){

var arr = line.split(":");

if ((arr.length >= 3) && (arr[0] == username)){

return int.parse(arr[2]);
}
}

// not found --------------------

log_error("UserId not found for userName: %s".printf(username));

return -1;
}

public string get_username_from_uid(int user_id){

// check local user accounts in /etc/passwd -------------------

foreach(var line in file_read("/etc/passwd").split("\n")){

var arr = line.split(":");

if ((arr.length >= 3) && (arr[2] == user_id.to_string())){

return arr[0];
}
}

// not found --------------------

log_error("Username not found for uid: %d".printf(user_id));

return "";
}

public string get_user_home(string username = get_username()){

// check local user accounts in /etc/passwd -------------------

foreach(var line in file_read("/etc/passwd").split("\n")){

var arr = line.split(":");

if ((arr.length >= 6) && (arr[0] == username)){

return arr[5];
}
}

// not found --------------------

log_error("Home directory not found for user: %s".printf(username));

return "";
}

public string get_user_home_effective(){
return get_user_home(get_username_effective());
public string? get_username_from_uid(int user_id){
unowned Posix.Passwd? pw = Posix.getpwuid(user_id);
return pw?.pw_name;
}

// system ------------------------------------
Expand All @@ -164,18 +83,27 @@ namespace TeeJee.System{

// open -----------------------------

public bool xdg_open (string file, string user = ""){
string path = get_cmd_path ("xdg-open");
if ((path != null) && (path != "")){
string cmd = "xdg-open '%s'".printf(escape_single_quote(file));
if (user.length > 0){
cmd = "pkexec --user %s env DISPLAY=$DISPLAY XAUTHORITY=$XAUTHORITY ".printf(user) + cmd;
public bool xdg_open (string file){
string path = get_cmd_path("xdg-open");
if ((path == null) || (path == "")) {
return false;
}

string cmd = "xdg-open '%s'".printf(escape_single_quote(file));

// find correct user
int uid = get_user_id();
if(uid > 0) {
// non root
string? user = get_username_from_uid(uid);
if(user != null) {
cmd = "pkexec --user %s env DISPLAY=$DISPLAY XAUTHORITY=$XAUTHORITY DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%i/bus ".printf(user, uid) + cmd;
}
log_debug(cmd);
int status = exec_script_async(cmd);
return (status == 0);
}
return false;

log_debug(cmd);
int status = exec_script_async(cmd);
return (status == 0);
}

public bool exo_open_folder (string dir_path, bool xdg_open_try_first = true){
Expand Down
Loading