Skip to content

Commit

Permalink
Some small fixes (#862)
Browse files Browse the repository at this point in the history
* Also use PKEXEC_UID to get username

Privilege elevation can occur through pkexec, where many environment
variables are not accessible.

This fixes the following problem - if howdy-gtk is run without sudo,
authorization occurs via pkexec, and the user variable is empty. So when
adding the first model, it is unclear to which user to add it.

* Update the container when the slide changes

In some GTK themes, when we change a slide, we see a blank window
because there is nothing to trigger the size update, and the slide is
displayed at zero size. Let's force a size update so that it always
works.

* Remove reading of non-existent '_variables' file

* More correct preview when stretching the window

The "Video" tab layout did not display correctly when resizing the
window.

* Don't add a model if the user list is empty

The list of users may be empty, and if you try to add a model, a string
concatenation error with None will occur.

For simplicity and consistency with the "Delete" button, we simply check
the size of the list after clicking.

* Show real camera ID in the 'Video' tab

* Handle the case if there are no cameras via except

Otherwise, when trying to read the /dev/v4l/by-path directory, an
exception is thrown and the program visually freezes.
  • Loading branch information
Gliese852 committed Jan 17, 2024
1 parent d4eb16c commit 344eb34
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 11 deletions.
5 changes: 1 addition & 4 deletions howdy-gtk/src/main.glade
Expand Up @@ -355,14 +355,11 @@
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="position">1</property>
Expand Down
9 changes: 6 additions & 3 deletions howdy-gtk/src/onboarding.py
Expand Up @@ -27,6 +27,7 @@ def __init__(self):
self.builder.connect_signals(self)

self.window = self.builder.get_object("onboardingwindow")
self.slidecontainer = self.builder.get_object("slidecontainer")
self.nextbutton = self.builder.get_object("nextbutton")

self.slides = [
Expand All @@ -53,6 +54,8 @@ def go_next_slide(self, button=None):
self.slides[self.window.current_slide].hide()
self.slides[self.window.current_slide + 1].show()
self.window.current_slide += 1
# the shown child may have zero/wrong dimensions
self.slidecontainer.queue_resize()

if self.window.current_slide == 1:
self.execute_slide1()
Expand Down Expand Up @@ -119,10 +122,10 @@ def is_gray(frame):
except Exception:
self.show_error(_("Error while importing OpenCV2"), _("Try reinstalling cv2"))

device_ids = os.listdir("/dev/v4l/by-path")
device_rows = []

if not device_ids:
try:
device_ids = os.listdir("/dev/v4l/by-path")
except Exception:
self.show_error(_("No webcams found on system"), _("Please configure your camera yourself if you are sure a compatible camera is connected"))

# Loop though all devices
Expand Down
2 changes: 2 additions & 0 deletions howdy-gtk/src/tab_models.py
Expand Up @@ -44,6 +44,8 @@ def on_user_add(self, button):


def on_model_add(self, button):
if self.userlist.items == 0:
return
# Open question dialog
dialog = gtk.MessageDialog(parent=self, flags=gtk.DialogFlags.MODAL, type=gtk.MessageType.QUESTION, buttons=gtk.ButtonsType.OK_CANCEL)
dialog.set_title(_("Confirm Model Creation"))
Expand Down
5 changes: 3 additions & 2 deletions howdy-gtk/src/tab_video.py
Expand Up @@ -14,14 +14,15 @@

def on_page_switch(self, notebook, page, page_num):
if page_num == 1:
path = "/dev/video1"

try:
self.config = configparser.ConfigParser()
self.config.read(paths_factory.config_file_path())
except Exception:
print(_("Can't open camera"))

path = self.config.get("video", "device_path")

try:
# if not self.cv2:
import cv2
Expand All @@ -30,7 +31,7 @@ def on_page_switch(self, notebook, page, page_num):
print(_("Can't import OpenCV2"))

try:
self.capture = cv2.VideoCapture(self.config.get("video", "device_path"))
self.capture = cv2.VideoCapture(path)
except Exception:
print(_("Can't open camera"))

Expand Down
1 change: 0 additions & 1 deletion howdy/src/autocomplete/howdy.in
Expand Up @@ -5,7 +5,6 @@
_howdy() {
local cur prev opts
local config_path="@config_path@"
source _variables
COMPREPLY=()
# The argument typed so far
cur="${COMP_WORDS[COMP_CWORD]}"
Expand Down
5 changes: 4 additions & 1 deletion howdy/src/cli.py
Expand Up @@ -4,6 +4,7 @@
# Import required modules
import sys
import os
import pwd
import getpass
import argparse
import builtins
Expand All @@ -13,8 +14,10 @@
# Try to get the original username (not "root") from shell
sudo_user = os.environ.get("SUDO_USER")
doas_user = os.environ.get("DOAS_USER")
pkexec_uid = os.environ.get("PKEXEC_UID")
pkexec_user = pwd.getpwuid(int(pkexec_uid))[0] if pkexec_uid else ""
env_user = getpass.getuser()
user = next((u for u in [sudo_user, doas_user, env_user] if u), "")
user = next((u for u in [sudo_user, doas_user, pkexec_user, env_user] if u), "")

# If that fails, error out
if user == "":
Expand Down

0 comments on commit 344eb34

Please sign in to comment.