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.

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

#31: Support multiple devices per user #177

Merged
merged 57 commits into from
Jul 20, 2024
Merged
Changes from 1 commit
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
13cb6fc
Update changelog
mcdope Aug 23, 2022
119ff4f
Update AUTHORS
mcdope Aug 23, 2022
daeaadc
Update version numbers
mcdope Aug 23, 2022
92e5de2
Update fedora changelog
mcdope Aug 23, 2022
5a84cc5
Update debian changelog
mcdope Aug 23, 2022
a9d08e5
Fix debian changelog
mcdope Aug 23, 2022
50e44a4
Update debian/source/option
mcdope Aug 23, 2022
940f19a
Use same name in fedora changes then for debian / realname everywhere
mcdope Aug 23, 2022
5515521
Update README.md
mcdope Aug 23, 2022
50cdf61
[Docs] Update non-manpage "doc/" files
Aug 24, 2022
7c5e976
[Packaging] [Debian] Fix config script picking up device serials as n…
mcdope Aug 24, 2022
61b90c5
#165: Update ChangeLog and debian/changelog
mcdope Aug 24, 2022
b69db4a
Merge remote-tracking branch 'origin/master' into prepare-083
mcdope Aug 25, 2022
dc41184
Update changelogs
mcdope Aug 25, 2022
20be5fd
[local.c] Fix tiny memleak
mcdope Aug 26, 2022
5a6d8b8
#31: Prepare conf.c/xpath.c for multiple devices per user
mcdope Aug 27, 2022
6ea5419
#31: [device.c] pusb_device_connected() -> loop device_list and assig…
mcdope Aug 27, 2022
a4a4b0d
#31: Prepare dist/doc config for multi-device
mcdope Aug 27, 2022
d4d9709
#31: [pamusb-agent] add todo
mcdope Aug 27, 2022
f0a6fd0
#31 CI, plz?
mcdope Aug 27, 2022
5538ec6
#31: Fix errors
mcdope Aug 28, 2022
d2be4dd
#31: Don't iterate empty devices, fix 'nodevice' output
mcdope Aug 29, 2022
f1f5c9c
#31: Revert ae51375dda71ce44882b15b14c171b6f538d21a0, add support for…
mcdope Aug 29, 2022
7571f19
#31: Adjust tests for multi-device support
mcdope Aug 29, 2022
d71b610
#31: We cant load the mod 2x, so adjust tests accordingly
mcdope Aug 29, 2022
3ab2250
#31: Rename add-device back, since it only adds a single device
mcdope Aug 29, 2022
78ef7d4
#31: Fix detects-device testcase
mcdope Aug 29, 2022
b1947cd
#31: More test fixes
mcdope Aug 29, 2022
50d86f4
#31: Moremore test fixes
mcdope Aug 29, 2022
9615cb0
#31: Moar test fixes
mcdope Aug 29, 2022
7d3da0b
#31: Moarmoar test fixes
mcdope Aug 29, 2022
68504d7
#31: Get some debug output
mcdope Aug 29, 2022
869a101
#31: Manually mount alternate stick
mcdope Aug 29, 2022
ba01aa5
Merge branch 'master' into issue-31-experimental-multidevice-support
mcdope Sep 1, 2022
87410ca
Merge remote-tracking branch 'origin/master' into issue-31-experiment…
mcdope Sep 3, 2022
eac01e1
Merge branch 'master' into issue-31-experimental-multidevice-support
mcdope Mar 12, 2023
744024e
Merge branch 'master' into issue-31-experimental-multidevice-support
mcdope Mar 18, 2023
173234c
Merge remote-tracking branch 'origin/master' into issue-31-experiment…
mcdope Mar 20, 2023
054ce36
Merge remote-tracking branch 'origin/issue-31-experimental-multidevic…
mcdope Mar 20, 2023
0f32e33
Merge remote-tracking branch 'origin/master' into issue-31-experiment…
mcdope Jan 3, 2024
e198f0e
Merge remote-tracking branch 'origin/master' into issue-31-experiment…
mcdope Jan 7, 2024
6a30c3d
ä31: Misc
mcdope Jan 7, 2024
35fbd34
#31: Misc
mcdope Jan 8, 2024
c4aa26d
#31: Update todos
mcdope Mar 31, 2024
538d50d
Merge remote-tracking branch 'origin/master' into issue-31-experiment…
mcdope Jul 12, 2024
1aca921
#31: Fix merge derp, make it actually work again
mcdope Jul 14, 2024
914896b
#31: Start to adjust agent
mcdope Jul 14, 2024
4e2d5b0
Merge remote-tracking branch 'origin/master' into issue-31-experiment…
mcdope Jul 14, 2024
d2af4a4
#31: Continue work on agent [WIP/Broken]
mcdope Jul 14, 2024
256c630
#31: [agent] Start a thread for each device
mcdope Jul 14, 2024
0b2d52b
#31: [agent] Only react to event if no other device is connected for …
mcdope Jul 16, 2024
97037bd
#31: [Tests] Give more time for unlock event
mcdope Jul 16, 2024
5dc323c
#31: Run deepseek-coder-v2 over changed C files
mcdope Jul 16, 2024
f016b10
#31: Remove debug output
mcdope Jul 18, 2024
c68d079
#31: Remove even more debug output
mcdope Jul 18, 2024
cd95c82
#31: Remove even more debug output
mcdope Jul 18, 2024
1e69695
#31: Remove even more debug output
mcdope Jul 18, 2024
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
Prev Previous commit
Next Next commit
#31: Moar test fixes
mcdope committed Aug 29, 2022

Verified

This commit was signed with the committer’s verified signature.
JLLeitschuh Jonathan Leitschuh
commit 9615cb02d6d5e2d599acf6bed2ed2bc635c3f21b
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ sudo modprobe g_mass_storage file=./virtual_usb.img stall=0 removable=y iSerialN
sleep 10

echo -en "pamusb-conf --add-device output:\t" # to fake the unhideable python output as expected output :P
sudo pamusb-conf --add-device=test2 --device=0 --volume=0 --yes | grep "Done" && cat /etc/security/pam_usb.conf | grep "SecondStick" > /dev/null && echo -e "Result:\t\t\tPASSED!" || exit 1
sudo pamusb-conf --add-device=test2 --device=0 --volume=0 --yes | grep "Done" && cat /etc/security/pam_usb.conf | grep "1234567891" > /dev/null && echo -e "Result:\t\t\tPASSED!" || exit 1

echo -en "pamusb-conf --add-user output:\t" # to fake the unhideable python output as expected output :P
sudo pamusb-conf --add-user=`whoami` --device=0 --yes | grep "Done" && cat /etc/security/pam_usb.conf | grep "<device>SecondStick</device>" > /dev/null && echo -e "Result:\t\t\tPASSED!" || exit 1
sudo pamusb-conf --add-user=`whoami` --device=0 --yes | grep "Done" && cat /etc/security/pam_usb.conf | grep "<device>test2</device>" > /dev/null && echo -e "Result:\t\t\tPASSED!" || exit 1