Archived
1
0
Fork 0

Compare commits

..

406 commits

Author SHA1 Message Date
Charlie Noyce Root
b8d4ff1a58 Revert "Multi-thread grades generation"
This reverts commit 2e5b2af4d8.
2014-01-17 02:17:41 +01:00
Mercier Pierre-Olivier
2e5b2af4d8 Multi-thread grades generation 2014-01-17 01:52:20 +01:00
Mercier Pierre-Olivier
8ddca7c49a Fix format of who tags 2014-01-17 00:05:44 +01:00
Mercier Pierre-Olivier
767a4f9be2 Trace printer handles <who/> tags 2014-01-16 23:32:52 +01:00
Mercier Pierre-Olivier
24df9247e7 Bonus/malus are now individual by default 2014-01-16 23:25:03 +01:00
Mercier Pierre-Olivier
4877749a76 Implement delId method for traces 2014-01-15 19:43:22 +01:00
Mercier Pierre-Olivier
b38f15b0b6 Allow negative bonus 2014-01-15 00:40:41 +01:00
Mercier Pierre-Olivier
aa3b69f5b3 Grades: fix globing exponentiation 2014-01-14 00:58:44 +01:00
Mercier Pierre-Olivier
6e70dc24ff lpt: new command account add to import account information from passwd like file. Closes #22244 2014-01-12 06:27:12 +01:00
Mercier Pierre-Olivier
e9ea5fc3a5 Solve #22243 2014-01-12 05:54:35 +01:00
Mercier Pierre-Olivier
cb9bf00da4 check_ssh_key: now check file content before type validity 2014-01-12 05:02:00 +01:00
Mercier Pierre-Olivier
6dca90348a New git_str format: allow moulettes to push tags begining by ACU- 2014-01-12 05:01:29 +01:00
Mercier Pierre-Olivier
1a25069726 New moulette command: can send a tarball (e.g.: for exam) 2014-01-12 05:00:57 +01:00
Mercier Pierre-Olivier
5e174fc053 New moulette command: can set max_memory variable 2014-01-12 05:00:24 +01:00
Mercier Pierre-Olivier
8170216edc Add debug 2014-01-09 21:44:47 +01:00
Mercier Pierre-Olivier
f5ff3c83b3 Grades from defenses are now the same for the group 2014-01-09 18:00:29 +01:00
Mercier Pierre-Olivier
ea711bc7bc Ticket #22238 2013-12-22 11:44:22 +01:00
Mercier Pierre-Olivier
c6352b8897 Set a default ID on eval without id 2013-12-20 17:35:22 +01:00
Mercier Pierre-Olivier
5b1382fc71 pizzin_a allowed to push erlear 2013-12-19 09:04:57 +01:00
Mercier Pierre-Olivier
3a5dbc55a8 Add new APPING3 for TC 2013-12-18 21:22:38 +01:00
Mercier Pierre-Olivier
3e5a587dd1 Allow LSE to connect to project-lse repo 2013-12-18 19:13:06 +01:00
Mercier Pierre-Olivier
65e2f61319 Fix connection to gearman server 2013-12-15 18:31:46 +01:00
Mercier Pierre-Olivier
929d146770 Ticket #22220: Two new habitent_loin 2013-12-15 12:17:33 +01:00
Mercier Pierre-Olivier
700002396b Add Apping2/3 to habitent_loin exception 2013-12-12 10:19:01 +01:00
Mercier Pierre-Olivier
33222d78c5 Fix defense_id generation 2013-12-12 05:42:57 +01:00
Mercier Pierre-Olivier
744c3db27c Fix account creation 2013-12-09 22:53:42 +01:00
Mercier Pierre-Olivier
531864ef8d Allow . in defense filename 2013-12-09 18:48:52 +01:00
Mercier Pierre-Olivier
cdb64f192f Mark ACU- and YAKA- as reserved tag 2013-12-08 08:28:49 +01:00
Mercier Pierre-Olivier
0e3fe1fd1c Exception, ticket #22149 2013-12-06 16:33:56 +01:00
Mercier Pierre-Olivier
737a12d443 Excpetion 2013-12-06 00:10:03 +01:00
Mercier Pierre-Olivier
eb8c74d465 Add action flush to stats 2013-12-05 07:19:20 +01:00
Mercier Pierre-Olivier
4482f47eec Fix set_workers 2013-12-05 06:48:42 +01:00
Mercier Pierre-Olivier
874c6bc482 Fix moulette/launch: can pass more than one login 2013-12-05 06:44:50 +01:00
Mercier Pierre-Olivier
4d003d6626 Add new moulette command: set_workers 2013-12-05 06:44:43 +01:00
Mercier Pierre-Olivier
3c60afe6e9 Fix stats 2013-12-05 06:05:24 +01:00
Mercier Pierre-Olivier
81150b41fe Fix stats 2013-12-05 06:03:28 +01:00
Mercier Pierre-Olivier
0e0a93789e Add new command for moulette: stats 2013-12-05 06:01:52 +01:00
Mercier Pierre-Olivier
973bc3f7b1 send_git: fix ACU- 2013-12-05 05:59:06 +01:00
Mercier Pierre-Olivier
95f945f963 send_git: ACU- 2013-12-05 05:55:35 +01:00
Mercier Pierre-Olivier
ba19732a47 post-update hook: ACU- 2013-12-05 05:00:09 +01:00
Mercier Pierre-Olivier
4af0617cae Receive ACU-* tags 2013-12-05 01:09:55 +01:00
Mercier Pierre-Olivier
d1b027a3ff Autoflush log filehandles 2013-12-05 00:54:30 +01:00
Mercier Pierre-Olivier
4e1e73f284 Add intradmin-hamano to gen_git_str for send_git process 2013-12-05 00:54:04 +01:00
Mercier Pierre-Olivier
6d294dbcf6 Save witch person push or clone to a repo 2013-12-03 01:08:47 +01:00
Mercier Pierre-Olivier
15408c1144 Remove INFO submission 2013-12-02 23:33:39 +01:00
Mercier Pierre-Olivier
45ba55a416 New hooks version: allow ACU-* tags 2013-12-02 21:11:17 +01:00
Mercier Pierre-Olivier
868324e6e2 Remove git access from VJ 2013-12-02 18:21:06 +01:00
Mercier Pierre-Olivier
f6a96399c2 New gen_git_str 2013-12-02 18:20:10 +01:00
Mercier Pierre-Olivier
2520bf59a3 Fix gearmand server destination 2013-12-01 17:37:09 +01:00
Mercier Pierre-Olivier
1e9e89656d Add DEBUG string 2013-12-01 06:16:51 +01:00
Mercier Pierre-Olivier
aef2b7d71e Add part for guantanamo.tar.gz 2013-12-01 06:12:27 +01:00
Mercier Pierre-Olivier
bbde682896 Try a fix 2013-12-01 06:04:37 +01:00
Mercier Pierre-Olivier
d077a5933f Try a fix 2013-12-01 05:58:19 +01:00
Mercier Pierre-Olivier
faf03232f4 Tiny fixes 2013-12-01 04:21:04 +01:00
Mercier Pierre-Olivier
05c7f4b9c6 Add DEBUG log 2013-12-01 03:40:12 +01:00
Mercier Pierre-Olivier
810c589ec0 Git hook exception (VJ + #22077) 2013-12-01 01:44:20 +01:00
Mercier Pierre-Olivier
24170b0b4e CPP is now the guantanamo master 2013-12-01 01:14:35 +01:00
Mercier Pierre-Olivier
415b5c81fd Use multiple Gearman servers 2013-12-01 01:12:02 +01:00
Mercier Pierre-Olivier
16f3dbfecb New guantanomo_list command 2013-11-30 22:32:21 +01:00
Mercier Pierre-Olivier
9de4ca25b0 Guantanamo: add list action to master process 2013-11-30 22:24:34 +01:00
Mercier Pierre-Olivier
971851633d Add execution right to lpt 2013-11-29 18:17:42 +01:00
Root Cpp Charlie
67d851658c Merge branch 'master' of ssh://cpp/liblerdorf 2013-11-29 18:14:08 +01:00
Mercier Pierre-Olivier
55bec752b5 Really close account when strong-auth close 2013-11-29 17:37:52 +01:00
Mercier Pierre-Olivier
ad2748650b Guantanamo: avoid deadlock by sending register action in background 2013-11-28 20:32:49 +01:00
Mercier Pierre-Olivier
a0f9002efd Guantanamo: use sh to parse command 2013-11-28 20:28:52 +01:00
Mercier Pierre-Olivier
5fe1d4c80d Fix utf-8 2013-11-27 15:26:13 +01:00
Mercier Pierre-Olivier
dfb66035eb New hook post-update 2013-11-26 19:17:19 +01:00
Mercier Pierre-Olivier
84c34f8fea Fix guantanamo syntax 2013-11-25 19:20:03 +01:00
Root Cpp Charlie
605007fb56 Merge branch 'master' of ssh://cpp/liblerdorf 2013-11-24 01:08:20 +01:00
Mercier Pierre-Olivier
9c3ebb5139 Ok 2013-11-24 01:08:11 +01:00
Root Cpp Charlie
b69c30d3d0 Merge branch 'master' of ssh://cpp/liblerdorf 2013-11-24 01:05:32 +01:00
Mercier Pierre-Olivier
db6814f4de Only last directory is repo_name 2013-11-24 01:05:08 +01:00
Mercier Pierre-Olivier
8929aba28d Add dufour_h exception 2013-11-23 23:20:34 +01:00
Mercier Pierre-Olivier
cddafdf0ad Exceptions 2013-11-23 21:13:11 +01:00
Mercier Pierre-Olivier
3a00d6344a Faster grading 2013-11-23 20:30:20 +01:00
Mercier Pierre-Olivier
6e655751d4 Ok :) 2013-11-23 20:11:53 +01:00
Mercier Pierre-Olivier
be336da8d6 Try to fix grades 2013-11-23 20:08:03 +01:00
Mercier Pierre-Olivier
b4fc037a06 glob_to_regex 2013-11-23 17:31:16 +01:00
Mercier Pierre-Olivier
f271f36203 Use Text::Glob instead of ACU::Tinyglob 2013-11-23 17:21:46 +01:00
Mercier Pierre-Olivier
f8e5d1b5c0 Fix grades generation 2013-11-23 04:18:32 +01:00
Mercier Pierre-Olivier
37dde8ce57 Fix API::Projects::get_groups 2013-11-23 03:09:53 +01:00
Mercier Pierre-Olivier
ce15c69841 Habitent loin : molini_v 2013-11-22 21:11:36 +01:00
Mercier Pierre-Olivier
a02ed70d5d Trace: fix warnings 2013-11-21 21:28:45 +01:00
Mercier Pierre-Olivier
7f418a06fe Fix API call 2013-11-21 21:01:14 +01:00
Mercier Pierre-Olivier
44722fdd93 Fix denfense publication 2013-11-21 14:47:36 +01:00
Mercier Pierre-Olivier
b25a862650 Fix condition 2013-11-20 01:45:30 +01:00
Mercier Pierre-Olivier
1d0d92b040 Add traces for debug 2013-11-20 01:13:54 +01:00
Mercier Pierre-Olivier
26f58dcaa6 Add log 2013-11-20 01:04:30 +01:00
Mercier Pierre-Olivier
49e5dcddf4 Remove old .ft 2013-11-20 00:54:01 +01:00
Mercier Pierre-Olivier
f02f484cb8 gen_grades: better resolution of names 2013-11-18 22:28:10 +01:00
Mercier Pierre-Olivier
555c922786 send_git: Year can be omitted 2013-11-18 18:57:30 +01:00
Mercier Pierre-Olivier
dcb6033caa Add new scripts for moulettes 2013-11-16 21:45:25 +01:00
Mercier Pierre-Olivier
db62048be2 Hook: Use GL_USER instead of repo_login 2013-11-16 13:32:39 +01:00
Root Cpp Charlie
58f77270c2 Merge branch 'master' of ssh://cpp/liblerdorf 2013-11-15 12:41:49 +01:00
Mercier Pierre-Olivier
2f6b3a9812 Fix LDAP search 2013-11-15 12:40:29 +01:00
Root Cpp Charlie
3d3dfc47c0 Merge branch 'master' of ssh://cpp/liblerdorf 2013-11-15 09:22:00 +01:00
Mercier Pierre-Olivier
984cb050fa Allow .google-authenticator under 100b 2013-11-15 09:21:33 +01:00
Root Cpp Charlie
f38abe3547 Merge branch 'master' of ssh://cpp/liblerdorf 2013-11-15 09:07:31 +01:00
Mercier Pierre-Olivier
77bee709ed LDAP name convert to IPv6 2013-11-15 09:04:45 +01:00
Root Cpp Charlie
628dd6ab5c Merge branch 'master' of ssh://cpp/liblerdorf 2013-11-15 08:50:09 +01:00
Mercier Pierre-Olivier
a809c4ff8d COnvert to UTF8 lpt 2013-11-15 08:49:59 +01:00
Root Cpp Charlie
e48f136bca Merge branch 'master' of ssh://cpp/liblerdorf 2013-11-15 08:48:49 +01:00
Mercier Pierre-Olivier
1d5562b073 New repo.sh migration 2013-11-15 08:39:52 +01:00
Root Cpp Charlie
239a636167 Merge branch 'master' of ssh://cpp/liblerdorf 2013-11-14 20:34:20 +01:00
Mercier Pierre-Olivier
9bcf8c7c2d Update gl-pre-git exceptions 2013-11-14 20:34:12 +01:00
Root Cpp Charlie
8c50d5954b Merge branch 'master' of ssh://cpp/liblerdorf 2013-11-14 17:35:23 +01:00
Mercier Pierre-Olivier
b959187718 Fix sendmail 2013-11-14 17:35:14 +01:00
Root Cpp Charlie
dd01b53d68 Merge branch 'master' of ssh://cpp/liblerdorf 2013-11-14 16:20:32 +01:00
Mercier Pierre-Olivier
5247d4db53 Add sendmail option 2013-11-14 16:20:13 +01:00
Mercier Pierre-Olivier
947aebd490 Add sendmail option 2013-11-14 16:09:24 +01:00
Mercier Pierre-Olivier
33e32d2916 Add charset to sended log email 2013-11-14 16:03:30 +01:00
Root Cpp Charlie
a02881f42e Merge branch 'master' of ssh://cpp/liblerdorf 2013-11-14 15:58:34 +01:00
Mercier Pierre-Olivier
a4076fe953 Add Email::Sender::Simple as require deb pkg 2013-11-14 15:56:48 +01:00
Root Cpp Charlie
5a83714dad Merge branch 'master' of ssh://cpp/liblerdorf 2013-11-14 15:50:54 +01:00
Mercier Pierre-Olivier
54b407fa11 Fix requires Email::Sender::Simple thanks to TIBO 2013-11-14 15:47:25 +01:00
Mercier Pierre-Olivier
e11d9082da Activate mail_error on grading script 2013-11-14 15:26:17 +01:00
Mercier Pierre-Olivier
95c6d77613 Fix gen_grading due to lastest modification 2013-11-14 14:19:45 +01:00
Mercier Pierre-Olivier
bedb084ffe Add average in cvs 2013-11-13 03:07:56 +01:00
Mercier Pierre-Olivier
e2ba0a5e38 Remove exception #21858 2013-11-13 03:00:55 +01:00
Charlie Noyce Root
ca2c0e8f13 Fix get_csv 2013-11-13 02:33:27 +01:00
Mercier Pierre-Olivier
4a66e85060 Fix warning order in process return 2013-11-13 01:29:53 +01:00
Mercier Pierre-Olivier
bdef5a3c69 New error if project doesn't exists 2013-11-13 01:15:01 +01:00
Mercier Pierre-Olivier
c5a1bf8917 Display important warnings on process return 2013-11-13 01:12:05 +01:00
Mercier Pierre-Olivier
4e35cabf62 Display warnings on process return 2013-11-13 01:01:04 +01:00
Mercier Pierre-Olivier
0e92592d17 Fixing method name 2013-11-13 00:25:36 +01:00
Mercier Pierre-Olivier
6e3cbe7f04 Fixing syntax 2013-11-13 00:22:19 +01:00
Mercier Pierre-Olivier
81fd3a04e2 Trace: can export as string, can addId 2013-11-13 00:09:54 +01:00
Mercier Pierre-Olivier
5d2b1e80fb Merge repo.sh with aurier_j version 2013-11-11 17:57:27 +01:00
Mercier Pierre-Olivier
464fcfc879 Fixing grading 2013-11-11 17:16:03 +01:00
Mercier Pierre-Olivier
74f44a836b Forgotten use 2013-11-11 16:59:14 +01:00
Mercier Pierre-Olivier
fc595e9ee4 Fix warning 2013-11-11 16:57:44 +01:00
Mercier Pierre-Olivier
62bd5f2d2a Fix warning 2013-11-11 16:37:36 +01:00
Mercier Pierre-Olivier
add1bb5db9 Change output form of getIds 2013-11-11 16:35:34 +01:00
Mercier Pierre-Olivier
81058c9c20 Change input form of Trce 2013-11-11 16:32:50 +01:00
Mercier Pierre-Olivier
ddb8788eb6 Import API 2013-11-11 16:23:23 +01:00
Mercier Pierre-Olivier
440ace2654 Fix syntax 2013-11-11 16:15:59 +01:00
Mercier Pierre-Olivier
15f89a5e39 New parser for traces 2013-11-11 16:09:53 +01:00
Mercier Pierre-Olivier
1de1b9a221 New exception 2013-11-09 17:42:59 +01:00
Mercier Pierre-Olivier
584fbf9895 Add APPING1 to exception 2013-11-08 21:05:05 +01:00
Mercier Pierre-Olivier
cda7b5b026 LPT: fix grant-lab and add delete account capability 2013-11-07 14:46:28 +01:00
Mercier Pierre-Olivier
de88e60fa5 Fix too much kill of ssh-agent 2013-11-06 18:22:07 +01:00
Mercier Pierre-Olivier
8a4b545da6 chdir before remove dir 2013-11-06 18:13:08 +01:00
Mercier Pierre-Olivier
90727e48d5 Fix errors 2013-11-06 18:11:17 +01:00
Mercier Pierre-Olivier
0af1174ca8 Replace croak by die when unexpected error 2013-11-05 18:03:54 +01:00
Mercier Pierre-Olivier
fe9cc480a1 Add install procedure into manage-server 2013-11-05 17:41:12 +01:00
Mercier Pierre-Olivier
3c0e0f09be Migration: migrate also .ltx files 2013-11-05 17:41:12 +01:00
Nicolas Geniteau
92a222d346 hook dump-help 2013-11-05 17:37:03 +01:00
Nicolas Geniteau
dfbd4e69ba ACU::Jail 2013-11-05 17:29:06 +01:00
Nicolas Geniteau
691a724061 adding otto as server 2013-11-05 17:26:56 +01:00
Nicolas Geniteau
90d22c3af0 Add Knuth in servers list 2013-11-05 03:45:35 +01:00
Root Cpp Charlie
45bae3f39b Merge branch 'master' of ssh://cpp/liblerdorf 2013-11-04 02:24:12 +01:00
Mercier Pierre-Olivier
ed0edaf9f3 Change unlink to remove_tree in ordre to clean git_manage_ temporary directories 2013-11-04 02:23:47 +01:00
Mercier Pierre-Olivier
9dbf492046 Check Fact is already running after call it 2013-11-03 03:39:43 +01:00
Mercier Pierre-Olivier
b5a8b5f5f9 Launch send_git in background 2013-11-03 03:12:57 +01:00
Mercier Pierre-Olivier
801d59d860 FreeBSD.. 2013-11-03 01:52:05 +01:00
Mercier Pierre-Olivier
89167d47d2 FreeBSD... 2013-11-03 01:51:34 +01:00
Mercier Pierre-Olivier
aa71e36f8b FreeBSD... 2013-11-03 01:47:15 +01:00
Mercier Pierre-Olivier
995fbdedd1 Launch send_git with ssh-agent 2013-11-03 01:42:44 +01:00
Mercier Pierre-Olivier
5b78698a5c Try to die 2013-11-03 01:30:09 +01:00
Mercier Pierre-Olivier
48bad8dca9 Try to die 2013-11-03 01:27:01 +01:00
Mercier Pierre-Olivier
7584473a76 Try to die 2013-11-03 01:25:49 +01:00
Mercier Pierre-Olivier
b38a5514e5 Fix presence of @ 2013-11-03 01:23:07 +01:00
Root Cpp Charlie
2f7839952c Merge branch 'master' of ssh://cpp/liblerdorf 2013-11-03 01:19:26 +01:00
Mercier Pierre-Olivier
61d523c7c3 Fix send_git 2013-11-03 01:18:58 +01:00
Mercier Pierre-Olivier
4ba4f34993 Clone via ssh instead of filesystem 2013-11-03 01:15:49 +01:00
Mercier Pierre-Olivier
6d9af44499 FreeBSD ... 2013-11-03 01:06:51 +01:00
Mercier Pierre-Olivier
edcb3adf6d Fix for FreeBSD 2013-11-03 01:01:25 +01:00
Mercier Pierre-Olivier
731ca526f6 Add log 2013-11-03 00:57:58 +01:00
Mercier Pierre-Olivier
490d4109b9 No ref.ft require for ref 2013-11-03 00:52:15 +01:00
Root Cpp Charlie
7fc46ddbd4 Merge branch 'master' of ssh://cpp/liblerdorf 2013-11-03 00:37:04 +01:00
Mercier Pierre-Olivier
651c63fd38 Fix use of search_dns 2013-11-03 00:36:40 +01:00
Mercier Pierre-Olivier
fe067d847b Fix syntax 2013-11-03 00:12:23 +01:00
Mercier Pierre-Olivier
92b61213c6 Add email-mime to package list 2013-11-03 00:10:07 +01:00
Mercier Pierre-Olivier
df27747cbc Fix repository address 2013-11-03 00:06:58 +01:00
Mercier Pierre-Olivier
384a336851 croak instead of return 2013-11-03 00:06:36 +01:00
Mercier Pierre-Olivier
5c3309d042 New state: PENDING 2013-10-31 16:50:04 +01:00
Root Cpp Charlie
da5683bb5c Merge branch 'master' of ssh://cpp/liblerdorf 2013-10-31 16:16:09 +01:00
Mercier Pierre-Olivier
ae330ab897 Fix multiple inclusion of Email::Sender::Simple 2013-10-31 16:15:27 +01:00
Mercier Pierre-Olivier
80d3352b78 Fix 0 2013-10-30 17:19:31 +01:00
Mercier Pierre-Olivier
d44ffa7153 Fix launch on GNU/Linux 2013-10-30 17:14:41 +01:00
Mercier Pierre-Olivier
e327bf0c80 Print 0 instead of nothing 2013-10-30 17:10:36 +01:00
Mercier Pierre-Olivier
67f5f78f85 require QUota 2013-10-30 14:51:02 +01:00
Mercier Pierre-Olivier
784c7cfb55 Last moulette_get 2013-10-30 14:45:21 +01:00
Mercier Pierre-Olivier
e009942a7c Fix quota use in lpt 2013-10-30 08:41:47 +01:00
Mercier Pierre-Olivier
24c6ed57e0 New package to install 2013-10-30 03:17:32 +01:00
Mercier Pierre-Olivier
cda080ce72 Prefer use of require instead of eval 2013-10-30 02:46:17 +01:00
Mercier Pierre-Olivier
1f61b7a144 Interact with new intranet group API 2013-10-30 02:38:50 +01:00
Mercier Pierre-Olivier
27f7b7c9ce Fix screen launch on FreeBSD 2013-10-30 02:36:12 +01:00
Mercier Pierre-Olivier
e5a23dc3e8 LPT v2 finalized 2013-10-30 02:34:11 +01:00
Root Cpp Charlie
9ff6402d87 Merge branch 'master' of ssh://cpp/liblerdorf 2013-10-28 15:13:24 +01:00
Mercier Pierre-Olivier
5857719f94 LDAP: Fix for stabilization 2013-10-28 15:11:04 +01:00
Mercier Pierre-Olivier
2d7c59694a Manual things 2013-10-26 17:46:46 +02:00
Mercier Pierre-Olivier
37c02fedb2 Fix LDAP attribute suppression 2013-10-25 00:18:15 +02:00
Root Cpp Charlie
7214b54053 Merge branch 'master' of ssh://cpp/liblerdorf 2013-10-23 06:57:22 +02:00
Mercier Pierre-Olivier
b5806fac12 Add hook for conferences repository 2013-10-23 06:57:13 +02:00
Mercier Pierre-Olivier
ddd63ece67 New Habitent loin 2013-10-23 06:54:14 +02:00
Mercier Pierre-Olivier
9add1cf2f5 Find test.ft in $submitdir 2013-10-21 23:45:05 +02:00
Mercier Pierre-Olivier
279b9ea07e Typo in API/Projects.pm 2013-10-21 18:44:30 +02:00
Mercier Pierre-Olivier
8e3d6e5464 Pass the flavour to the Intranet when creating project 2013-10-21 00:40:41 +02:00
Mercier Pierre-Olivier
ef85ae2708 Fix gl-pre-git 2013-10-20 09:47:13 +02:00
Mercier Pierre-Olivier
ff9c3a5ad2 Introduce Habitent loin people 2013-10-20 02:15:52 +02:00
Kevin Houdebert
73b1552199 Update repo.sh script 2013-10-19 19:29:29 +02:00
Kevin Houdebert
caa5ff9243 Fix brackets in \command latex 2013-10-19 17:52:39 +02:00
Root Cpp Charlie
49bbc958a5 Merge branch 'master' of ssh://cpp/liblerdorf 2013-10-18 18:33:52 +02:00
Mercier Pierre-Olivier
4c55167314 hooks/subjects: Fix concatenation error 2013-10-18 18:33:34 +02:00
Root Cpp Charlie
6a81847871 Merge branch 'master' of ssh://cpp/liblerdorf 2013-10-18 18:31:33 +02:00
Mercier Pierre-Olivier
791dfe65f6 gen_grading: fix compilation errors 2013-10-18 18:21:44 +02:00
Mercier Pierre-Olivier
cea68aa7a7 gen_grading: checck if there is a defense or trace before generate 2013-10-18 18:15:11 +02:00
Mercier Pierre-Olivier
63c2543fc1 Fix IP displayed in gl-pre-init is now correct 2013-10-18 09:24:49 +02:00
Mercier Pierre-Olivier
a9b720b355 Fix IP displayed in gl-pre-init is now correct 2013-10-18 09:22:15 +02:00
Mercier Pierre-Olivier
51257dd34b New process to send a trace to Intranet 2013-10-18 09:13:13 +02:00
Mercier Pierre-Olivier
37db6f3256 Launch send_git process on hamano 2013-10-18 09:12:24 +02:00
Mercier Pierre-Olivier
9866ecde45 moulette_get: Merge receive_tar and receive_git 2013-10-18 09:11:43 +02:00
Mercier Pierre-Olivier
9fa9251590 hooks/submission: send git to moulette 2013-10-18 09:11:04 +02:00
Mercier Pierre-Olivier
b297e386d6 Add Sys::Gamin to required packages 2013-10-18 09:09:31 +02:00
Mercier Pierre-Olivier
18608fe325 hooks/subject: * not allowed in tag 2013-10-18 09:08:59 +02:00
Mercier Pierre-Olivier
72800c21cc New command to send a directory to moulette 2013-10-18 08:50:30 +02:00
Mercier Pierre-Olivier
0e35a1a2e9 send_git: new process to send a student repository to moulette 2013-10-18 08:48:43 +02:00
Mercier Pierre-Olivier
335b03768d moulette_get: Add jexec statements, monitor filesystem to send traces to intranet 2013-10-18 07:34:33 +02:00
Mercier Pierre-Olivier
4bff8d88eb Error message if unable to write to the trace directory 2013-10-18 04:57:37 +02:00
Mercier Pierre-Olivier
15790db577 intradata_get: croak instead of log+return 2013-10-18 04:54:28 +02:00
Mercier Pierre-Olivier
adb450343f LPT: handle intra groups: can create, remove, change known attribute, view, ... 2013-10-18 04:18:38 +02:00
Mercier Pierre-Olivier
aab3e767c0 Migration: handle subdirectory form for big projects 2013-10-18 04:16:18 +02:00
Mercier Pierre-Olivier
ad866e3a57 Add trace_update 2013-10-18 04:15:17 +02:00
Nicolas Geniteau
a3fca0f622 Change hook to send a specific action for ref 2013-10-17 15:00:34 +02:00
Mercier Pierre-Olivier
3f265bd9d6 Migration: fix cd from deleted directory 2013-10-12 02:49:15 +02:00
Mercier Pierre-Olivier
4979456cd0 gl-pre-git: display IP only if not authorized 2013-10-12 02:47:57 +02:00
Mercier Pierre-Olivier
b3acb0ba54 Process: change root tag name to process 2013-10-12 02:44:41 +02:00
Root Cpp Charlie
578b4ac41b Merge branch 'master' of ssh://cpp/liblerdorf 2013-10-07 20:19:31 +02:00
Mercier Pierre-Olivier
3347f08011 Differenciate R and W access to repo 2013-10-07 20:19:07 +02:00
Root Cpp Charlie
814d3ba2ef Merge branch 'master' of ssh://cpp/liblerdorf 2013-10-07 16:42:17 +02:00
Mercier Pierre-Olivier
ad9c91497c Install gl-pre-git at the right place 2013-10-07 16:42:02 +02:00
Mercier Pierre-Olivier
b126a0400a Fix scripts for FreeBSD 2013-10-05 22:01:34 +02:00
Nicolas Geniteau
9981ac3346 Fix long tag name for testsuite 2013-10-05 15:58:46 +02:00
Root Cpp Charlie
be18f40353 Merge branch 'master' of ssh://cpp/liblerdorf 2013-10-04 19:08:49 +02:00
Mercier Pierre-Olivier
e6c9c1251b Fix process stopping 2013-10-04 19:04:55 +02:00
Root Cpp Charlie
25008035eb Merge branch 'master' of ssh://cpp/liblerdorf 2013-10-02 22:08:48 +02:00
Mercier Pierre-Olivier
0951d36451 Fix launching on FreeBSD 2013-10-02 22:08:42 +02:00
Root Cpp Charlie
4c53e2ad06 Merge branch 'master' of ssh://cpp/liblerdorf 2013-10-02 22:02:48 +02:00
Mercier Pierre-Olivier
5de36e1709 New method for launching through su 2013-10-02 22:02:36 +02:00
Root Cpp Charlie
5ab6774a69 Merge branch 'master' of ssh://cpp/liblerdorf 2013-10-02 20:12:53 +02:00
Mercier Pierre-Olivier
81cb719417 Fix comma position 2013-10-02 20:12:45 +02:00
Root Cpp Charlie
25d57a260f Merge branch 'master' of ssh://cpp/liblerdorf 2013-10-02 19:45:54 +02:00
Mercier Pierre-Olivier
f3904e62b2 Add a way to remove bonus/malus 2013-10-02 19:45:48 +02:00
Root Cpp Charlie
d3444fac41 Merge branch 'master' of ssh://cpp/liblerdorf 2013-10-02 18:31:29 +02:00
Mercier Pierre-Olivier
663a77a084 Fix cast 2013-10-02 18:30:53 +02:00
Root Cpp Charlie
f26a78b252 Merge branch 'master' of ssh://cpp/liblerdorf 2013-10-02 18:26:22 +02:00
Mercier Pierre-Olivier
8eb6b143a1 New process: get_csv to get grades 2013-10-02 18:26:01 +02:00
Root Cpp Charlie
e2a3babac6 Merge branch 'master' of ssh://cpp/liblerdorf 2013-10-01 05:30:47 +02:00
Mercier Pierre-Olivier
ed690a4c2d Fix Make file 2013-10-01 05:30:41 +02:00
Root Cpp Charlie
11812fc1f6 Merge branch 'master' of ssh://cpp/liblerdorf 2013-10-01 04:57:58 +02:00
Mercier Pierre-Olivier
5ccc30daba Display error message on installation error 2013-10-01 04:57:52 +02:00
Root Cpp Charlie
e06bfc5f72 Merge branch 'master' of ssh://cpp/liblerdorf 2013-10-01 04:37:25 +02:00
Mercier Pierre-Olivier
05537dc903 Use /usr/bin/env instead of raw path, for compatibility between Linux and FreeBSD systems 2013-10-01 04:37:15 +02:00
Mercier Pierre-Olivier
0d26658a35 Add hook on tests to create the testsuite 2013-10-01 04:35:35 +02:00
Root Cpp Charlie
e9cc885e05 Merge branch 'master' of ssh://cpp/liblerdorf 2013-10-01 00:08:52 +02:00
Mercier Pierre-Olivier
140be16b5c Fix for loop for FreeBSD 2013-10-01 00:08:40 +02:00
Root Cpp Charlie
879b6890a5 Merge branch 'master' of ssh://cpp/liblerdorf 2013-09-30 13:13:02 +02:00
Mercier Pierre-Olivier
6fa013ff14 Globbing in grading is not critical 2013-09-30 13:12:46 +02:00
Root Cpp Charlie
757733176b Merge branch 'master' of ssh://cpp/liblerdorf 2013-09-30 13:08:55 +02:00
Mercier Pierre-Olivier
7a192c4732 Globbing in grading is not critical 2013-09-30 13:08:38 +02:00
Mercier Pierre-Olivier
326ce94617 Remove liblerdorf directory before untarring sources 2013-09-30 10:55:09 +02:00
Root Cpp Charlie
98efe85166 Merge branch 'master' of ssh://cpp/liblerdorf 2013-09-30 10:53:35 +02:00
Mercier Pierre-Olivier
4ae0d9f6e0 Add debug information in gl-pre-git hook 2013-09-30 10:53:21 +02:00
Mercier Pierre-Olivier
1f52c35bd6 Fix migration script 2013-09-30 10:52:58 +02:00
Root Cpp Charlie
c6b1936cb2 Merge branch 'master' of ssh://cpp/liblerdorf 2013-09-30 10:28:07 +02:00
Mercier Pierre-Olivier
266190ac03 Allow SM to clone and push 2013-09-30 10:27:44 +02:00
Mercier Pierre-Olivier
8ef18c4a3f Add guantanamo: a way to execute command in an unknown environnement 2013-09-29 04:34:11 +02:00
Mercier Pierre-Olivier
b951c4dc04 Patch for FreeBSD 2013-09-28 23:23:29 +02:00
Mercier Pierre-Olivier
672740685c Sanities LDAP code 2013-09-28 19:29:46 +02:00
Root Cpp Charlie
d29eb9a33e Merge branch 'master' of ssh://cpp/liblerdorf 2013-09-28 19:01:40 +02:00
Mercier Pierre-Olivier
8132fdb3e1 Manage_server: can clean logs 2013-09-28 18:39:15 +02:00
Root Cpp Charlie
f3cfbf6dbb Merge branch 'master' of ssh://cpp/liblerdorf 2013-09-28 13:47:19 +02:00
Mercier Pierre-Olivier
c4620ac241 Add execution write to view_log 2013-09-28 13:47:08 +02:00
Root Cpp Charlie
3fceded838 Merge branch 'master' of ssh://cpp/liblerdorf 2013-09-28 13:44:31 +02:00
Mercier Pierre-Olivier
56af84d6cb Fix log function 2013-09-28 13:43:27 +02:00
Mercier Pierre-Olivier
ba75c5c8fd manage_server: Add new command to view log remotely 2013-09-28 13:39:31 +02:00
Root Cpp Charlie
ccf622c98e Merge branch 'master' of ssh://cpp/liblerdorf 2013-09-28 11:16:48 +02:00
Mercier Pierre-Olivier
d7686f68c0 Check IP in gl-pre-git hook 2013-09-28 11:16:14 +02:00
Mercier Pierre-Olivier
a1e0e62b9c Check IP in gl-pre-git hook 2013-09-28 11:15:31 +02:00
Mercier Pierre-Olivier
8f5cd9a6be New packages and improve installation quality 2013-09-28 11:14:45 +02:00
Mercier Pierre-Olivier
d8a7ce5ecf Improving migration script 2013-09-28 11:13:07 +02:00
Mercier Pierre-Olivier
d5052ca239 Project: simplify code 2013-09-28 11:12:30 +02:00
Mercier Pierre-Olivier
1a142a9759 Log: ERROR2 is now ALERT 2013-09-28 11:11:50 +02:00
Mercier Pierre-Olivier
440f298d14 Improve migration script: scoped-include, \file, ... 2013-09-28 04:53:24 +02:00
Mercier Pierre-Olivier
dbfd12ec9d Fix process 2013-09-27 14:32:38 +02:00
Mercier Pierre-Olivier
c9e4aa3279 Fix 2013-09-26 12:58:42 +02:00
Mercier Pierre-Olivier
316f0d6bd9 Add compatibility with FreeBSD site 2013-09-26 12:58:31 +02:00
Mercier Pierre-Olivier
20d78c5dae Search globing if ref is defined 2013-09-26 11:38:17 +02:00
Mercier Pierre-Olivier
4e289ec442 Add ; after eval 2013-09-26 11:03:24 +02:00
Mercier Pierre-Olivier
6952c85c5b Use globing in notation 2013-09-26 10:55:56 +02:00
Mercier Pierre-Olivier
375640dba8 gen_grading: new method to generate name 2013-09-26 10:53:34 +02:00
Mercier Pierre-Olivier
5fa70f72d8 Tinyglob: add function to match 2013-09-26 10:07:17 +02:00
Mercier Pierre-Olivier
a40d249fd6 Add a tinyglobing package 2013-09-26 08:58:49 +02:00
Mercier Pierre-Olivier
babf3f7850 Working on moulette launching script 2013-09-26 07:08:41 +02:00
Mercier Pierre-Olivier
188650aeaf Process.pm: catch errors in processes and log it 2013-09-26 07:07:54 +02:00
Mercier Pierre-Olivier
899fd189f5 Generate defense ids for multiple defense 2013-09-26 04:32:31 +02:00
Mercier Pierre-Olivier
3ec51c56fc Skip defense traces 2013-09-26 03:32:09 +02:00
Mercier Pierre-Olivier
5257595639 Pass $ref to functions 2013-09-26 01:38:05 +02:00
Mercier Pierre-Olivier
025e938354 Handel $LOGIN in grades 2013-09-26 01:05:31 +02:00
Mercier Pierre-Olivier
9160fa0fb2 Change allow defense filename 2013-09-25 19:41:24 +02:00
Mercier Pierre-Olivier
adfb686d04 Remove empty identifier 2013-09-25 19:41:05 +02:00
Mercier Pierre-Olivier
780f189cd4 Tag the good commit 2013-09-24 20:18:23 +02:00
Mercier Pierre-Olivier
243a1c9224 Fix undefined variable use 2013-09-24 19:49:23 +02:00
Mercier Pierre-Olivier
237cafc34e Fix grading condition resolving 2013-09-24 19:36:58 +02:00
Mercier Pierre-Olivier
9c1c537e3c Remove pietri_a expcetion 2013-09-24 05:41:32 +02:00
Mercier Pierre-Olivier
80147e449f Grading generation ok 2013-09-24 05:14:16 +02:00
Mercier Pierre-Olivier
ea7d623eae Add new process for generating grading XML 2013-09-24 04:54:09 +02:00
Mercier Pierre-Olivier
3f337f9eb9 Group with id have now a completed ID 2013-09-24 04:19:44 +02:00
Mercier Pierre-Olivier
0f385f3838 Handle comma in bonus/malus files 2013-09-24 02:14:11 +02:00
Mercier Pierre-Olivier
488c2bbbb8 Can receive a process without XML format 2013-09-24 01:48:53 +02:00
Mercier Pierre-Olivier
d346848b90 Fix index in hook 2013-09-24 01:40:10 +02:00
Mercier Pierre-Olivier
89f9c5c6d3 Can give defense file without .xml 2013-09-24 00:43:02 +02:00
Mercier Pierre-Olivier
e60879ca6e Can give defense file without .xml 2013-09-24 00:41:56 +02:00
Mercier Pierre-Olivier
feb887d105 Can give defense file without .xml 2013-09-24 00:28:22 +02:00
Mercier Pierre-Olivier
9f7a2f1f15 Fix empty arg to tags 2013-09-24 00:27:20 +02:00
Mercier Pierre-Olivier
dd088dd210 Fix bad index to create defense 2013-09-24 00:24:47 +02:00
Mercier Pierre-Olivier
59aff8677a Fix grading generation from defenses 2013-09-22 15:10:32 +02:00
Mercier Pierre-Olivier
39758b9e4b Fix grading launch 2013-09-22 06:12:40 +02:00
Mercier Pierre-Olivier
cfd1cfd2e9 Launch grading in background 2013-09-22 06:11:02 +02:00
Mercier Pierre-Olivier
fe467fdd93 Exception for pietri_a 2013-09-22 00:51:54 +02:00
Mercier Pierre-Olivier
d709297002 Zero values are now treated as valid computation 2013-09-21 22:26:39 +02:00
Mercier Pierre-Olivier
664617171e New command to send bonus and malus 2013-09-21 19:13:25 +02:00
Mercier Pierre-Olivier
9fe8a83c2e Fix point without conditions 2013-09-21 18:29:17 +02:00
Mercier Pierre-Olivier
b3f61617f3 Always return a valid integer 2013-09-21 16:56:43 +02:00
Mercier Pierre-Olivier
6b64c6c0a2 Pass Ids by reference 2013-09-21 16:48:26 +02:00
Mercier Pierre-Olivier
73e52f441d Pass Ids by reference 2013-09-21 16:46:58 +02:00
Mercier Pierre-Olivier
c9c74a2a22 Reset after grading 2013-09-21 16:33:49 +02:00
Mercier Pierre-Olivier
b6b1c02dd0 Fix substitution 2013-09-21 16:23:41 +02:00
Mercier Pierre-Olivier
8ecbd779d0 Integrate final grade into grade.xml 2013-09-21 16:16:34 +02:00
Mercier Pierre-Olivier
f4ce8c79e0 Add grades tag 2013-09-21 15:59:46 +02:00
Mercier Pierre-Olivier
b34f3db750 Add way to generate grades to intradata-get 2013-09-21 15:34:30 +02:00
Mercier Pierre-Olivier
a036432edd Import Trace module 2013-09-20 18:14:38 +02:00
Mercier Pierre-Olivier
a5f6916df4 Separate lines 2013-09-20 18:13:10 +02:00
Mercier Pierre-Olivier
6191376362 Add some debug string 2013-09-20 18:06:34 +02:00
Mercier Pierre-Olivier
13434c4dcf Add some debug string 2013-09-20 18:05:19 +02:00
Mercier Pierre-Olivier
a380b4abbc Fix value determination 2013-09-20 18:03:40 +02:00
Mercier Pierre-Olivier
2037cf531b Add some debug string 2013-09-20 17:58:38 +02:00
Mercier Pierre-Olivier
de06d5fd0d intradata can get bonus/malus point 2013-09-20 17:43:12 +02:00
Mercier Pierre-Olivier
88eaf60cc5 Install package in FreeBSD 2013-09-20 17:40:36 +02:00
Mercier Pierre-Olivier
55e0870936 chmod for www-data write 2013-09-20 08:51:47 +02:00
Mercier Pierre-Olivier
37e095bb2e chown trace directory for defense 2013-09-20 08:47:17 +02:00
Mercier Pierre-Olivier
59ef2e1994 Fix location to find defense 2013-09-20 08:34:23 +02:00
Mercier Pierre-Olivier
476df5a622 Fix tag used named 2013-09-20 08:31:18 +02:00
Mercier Pierre-Olivier
78d733669f Preserve token between two commit 2013-09-20 08:18:09 +02:00
Mercier Pierre-Olivier
01b8f4327a Launch on ksh 2013-09-20 03:39:10 +02:00
Mercier Pierre-Olivier
a5fb66040b Start moulette_get process 2013-09-20 03:35:53 +02:00
Mercier Pierre-Olivier
42a73c9031 Long tag for defense 2013-09-20 02:50:12 +02:00
Mercier Pierre-Olivier
951470b06b Tag defense,... done 2013-09-20 02:01:39 +02:00
Mercier Pierre-Olivier
bad4dd3766 Start defense tag hook 2013-09-20 02:01:03 +02:00
Mercier Pierre-Olivier
751afab04f If there is an error with submission API, don't ask to check on the intranet 2013-09-19 21:56:57 +02:00
Mercier Pierre-Olivier
3ab8661fbf No more use Email::Sender::Simple 2013-09-19 20:57:47 +02:00
Mercier Pierre-Olivier
b5851bf5ed Remove gate from authorized address space 2013-09-19 05:02:40 +02:00
Mercier Pierre-Olivier
b470057ae7 Fix use Socket 2013-09-19 04:55:22 +02:00
Mercier Pierre-Olivier
9038f49904 Check IP before submission 2013-09-19 04:52:29 +02:00
Mercier Pierre-Olivier
188931f0d4 Can gen_groups in different years 2013-09-18 07:54:34 +02:00
Mercier Pierre-Olivier
8e4aab3940 Fix tag submission 2013-09-18 05:03:38 +02:00
Mercier Pierre-Olivier
03470f00be APL get password from ~mercie_d 2013-09-16 19:00:37 +02:00
Mercier Pierre-Olivier
b03703bf96 Kill others ssh-agent before relaunching one 2013-09-16 18:58:36 +02:00
Mercier Pierre-Olivier
4649360306 Use FQDN instead of relative domain in sync_ssh_keys 2013-09-16 18:56:48 +02:00
Mercier Pierre-Olivier
4ced1e540e Add Carp to Submission API 2013-09-16 07:10:39 +02:00
Mercier Pierre-Olivier
17ea229729 Submissions Ok 2013-09-16 07:09:23 +02:00
Mercier Pierre-Olivier
0825ca12e0 Parse project.xml 2013-09-16 06:43:33 +02:00
Mercier Pierre-Olivier
3678b13055 Works on old LWP::UserAgent 2013-09-16 06:43:17 +02:00
Mercier Pierre-Olivier
0e22becfb6 Fix installation 2013-09-16 04:31:41 +02:00
Mercier Pierre-Olivier
73513d2c0c Typo in submission.pl 2013-09-16 04:29:54 +02:00
Mercier Pierre-Olivier
7c92cd044a New dependancy 2013-09-16 04:27:37 +02:00
Mercier Pierre-Olivier
9210d07fda Start submission hook 2013-09-16 04:24:27 +02:00
Mercier Pierre-Olivier
fbef87cb09 Same :( 2013-09-16 00:20:26 +02:00
Mercier Pierre-Olivier
0accbacdf2 Same :( 2013-09-16 00:03:40 +02:00
Mercier Pierre-Olivier
29c5a66d25 Really do an update for user 2013-09-15 23:47:21 +02:00
Mercier Pierre-Olivier
885b0f8efb Write logs in file without buffering 2013-09-15 22:30:27 +02:00
Mercier Pierre-Olivier
29c9b0e694 Add description to users 2013-09-15 21:47:33 +02:00
Mercier Pierre-Olivier
b47dc439fa Recognize lowercase request 2013-09-15 17:49:05 +02:00
Mercier Pierre-Olivier
e492b3f67e Fix check_ssh_key 2013-09-15 17:12:48 +02:00
Mercier Pierre-Olivier
62550a59af Remove intradata_get from moore 2013-09-15 16:32:51 +02:00
Mercier Pierre-Olivier
0d88ff8eb6 Use basename instead of full path name 2013-09-15 15:44:47 +02:00
Mercier Pierre-Olivier
e44db62e10 New arg to update all servers 2013-09-15 15:40:09 +02:00
Mercier Pierre-Olivier
7b2a4185c9 New script to manage servers 2013-09-15 15:27:05 +02:00
Mercier Pierre-Olivier
0001a46686 Fix rm of an unexisting file 2013-09-15 14:54:36 +02:00
Mercier Pierre-Olivier
5aecf8b8b1 Add a command to generate pass 2013-09-15 14:51:25 +02:00
Mercier Pierre-Olivier
01e723db5e Add new dependancy 2013-09-15 14:48:42 +02:00
Mercier Pierre-Olivier
2a79cf1e6a Ready for deployement 2013-09-15 14:41:43 +02:00
Mercier Pierre-Olivier
34b72a4f4e Deployment script ok 2013-09-15 13:23:04 +02:00
Mercier Pierre-Olivier
59d27b9575 Start VCS/Git.pm 2013-09-15 13:22:47 +02:00
Mercier Pierre-Olivier
639c73a4cf New deployment script 2013-09-15 12:52:20 +02:00
Mercier Pierre-Olivier
01e0f10c38 Fix unterminated quoted string 2013-09-15 12:43:25 +02:00
Mercier Pierre-Olivier
85008adfdf Remove full tag when requested 2013-09-15 12:42:05 +02:00
Mercier Pierre-Olivier
13f85455f8 Create long tag after project creation 2013-09-15 12:33:34 +02:00
Mercier Pierre-Olivier
aebef9850e Extract list of users by year 2013-09-15 12:32:50 +02:00
Mercier Pierre-Olivier
e2f8d2389d New log level: DONE 2013-09-15 12:32:10 +02:00
Mercier Pierre-Olivier
905cc5f2e2 Fix token generation 2013-09-14 18:54:01 +02:00
Mercier Pierre-Olivier
feb69dd6f0 Fix typo 2013-09-14 18:44:22 +02:00
Mercier Pierre-Olivier
b6aaf11ae2 Warn only if project already exists 2013-09-14 18:43:46 +02:00
Mercier Pierre-Olivier
d9bc49c5d7 Generate token before saving butler.xml 2013-09-14 18:35:08 +02:00
Mercier Pierre-Olivier
9b53b5d7e8 Check certificate 2013-09-14 18:07:25 +02:00
Mercier Pierre-Olivier
5b8456fa69 Errors are best saved and shown 2013-09-14 18:00:18 +02:00
Mercier Pierre-Olivier
ecf03827c1 Hook subject OK 2013-09-14 17:40:23 +02:00
Mercier Pierre-Olivier
a90638153e Fix process launch 2013-09-14 11:19:06 +02:00
Mercier Pierre-Olivier
9353d1d4e6 Always call chown intradmin after update 2013-09-14 11:16:00 +02:00
Mercier Pierre-Olivier
1f55ca1bfe Fix install script 2013-09-14 11:05:18 +02:00
Mercier Pierre-Olivier
7c233e1873 Force /bin/sh to intradmin user 2013-09-14 11:00:36 +02:00
Mercier Pierre-Olivier
1e3c92e46a Fix Makefile 2013-09-14 10:56:31 +02:00
Mercier Pierre-Olivier
4857a0b228 Add a script to install requirements 2013-09-14 10:52:59 +02:00
Mercier Pierre-Olivier
82789d394f Add a script to launch screens on each server 2013-09-14 09:37:22 +02:00
Mercier Pierre-Olivier
580564e358 Add command to publish traces 2013-09-14 09:35:56 +02:00
57 changed files with 6779 additions and 1405 deletions

View file

@ -40,7 +40,13 @@ sub parse($$)
my $sax_handler;
$sax_handler = ResultHandler->new($parsed) if ($mod eq "ResultHandler");
if ($mod eq "ProjectHandler")
{
use ACU::Project;
$sax_handler = ProjectHandler->new($parsed);
}
$sax_handler = ProjectMemberHandler->new($parsed) if ($mod eq "ProjectMemberHandler");
$sax_handler = ProjectGroupHandler->new($parsed) if ($mod eq "ProjectGroupHandler");
my $parser = XML::SAX::ParserFactory->parser( Handler => $sax_handler );
@ -50,8 +56,8 @@ sub parse($$)
if ($@)
{
$parsed->{result} = 256;
$parsed->{message} = "Erreur du parser.";
log WARN, "Erreur du parser";
$parsed->{message} = "Erreur du parser : $@";
log WARN, "Erreur du parser.";
}
if (! exists $parsed->{result})
@ -70,6 +76,11 @@ sub get($$)
my $url = shift;
my $ua = LWP::UserAgent->new;
# Some old version of LWP::UserAgent doesn't support ssl_opts, this is not required
eval {
$ua->ssl_opts(SSL_ca_file => "/etc/ldap/cacert.pem");
};
log(DEBUG, 'GET Request to ', API_URL, $url);
my $req = GET API_URL . $url;
@ -86,11 +97,18 @@ sub send($$$)
my $url = shift;
my $ua = LWP::UserAgent->new;
# Some old version of LWP::UserAgent doesn't support ssl_opts, this is not required
eval {
$ua->ssl_opts(SSL_ca_file => "/etc/ldap/cacert.pem");
};
log(DEBUG, 'POST Request to ', API_URL, $url);
my $req = POST API_URL . $url, shift;
my $cnt = $ua->request($req)->content;
my $res = $ua->request($req);
log TRACE, $res;
my $cnt = $res->content();
log TRACE, $cnt;
return parse($next, $cnt);
@ -219,4 +237,84 @@ sub end_element
}
}
package ProjectGroupHandler;
use v5.10.1;
use strict;
use warnings;
sub new ($$)
{
my $class = shift;
my $self = {
parsed => shift,
savValue => 0,
lastGroup => {},
values => ""
};
bless $self, $class;
return $self;
}
sub start_element
{
my ($self, $element) = @_;
if ($element->{Name} eq "student")
{
$self->{values} = "";
$self->{savValue} = 1;
push @{ $self->{lastGroup}{stds} }, {
id => $element->{Attributes}{"{}id"}{Value},
chief => $element->{Attributes}{"{}chief"}{Value},
login => "",
};
}
elsif ($element->{Name} eq "group")
{
$self->{lastGroup}{id} = $element->{Attributes}{"{}id"}{Value};
$self->{lastGroup}{stds} = [];
}
elsif ($element->{Name} eq "result")
{
$self->{values} = "";
$self->{savValue} = 1;
}
}
sub characters
{
my ($self, $characters) = @_;
if ($self->{savValue}) {
$self->{values} .= $characters->{Data};
}
}
sub end_element
{
my ($self, $element) = @_;
if ($element->{Name} eq "result")
{
$self->{parsed}{result} = $self->{values};
$self->{savValue} = 0;
}
elsif ($element->{Name} eq "group")
{
push @{ $self->{parsed}{groups} }, $self->{lastGroup};
$self->{lastGroup} = {};
$self->{savValue} = 0;
}
elsif ($element->{Name} eq "student")
{
my $size = @{ $self->{lastGroup}{stds} };
(@{ $self->{lastGroup}{stds} })[$size - 1]{login} = $self->{values};
$self->{values} = "";
}
}
1;

View file

@ -10,18 +10,22 @@ use Carp;
use ACU::API::Base;
use ACU::LDAP;
sub add($;$)
sub add($$;$)
{
my $project_name = shift;
my $flavor = shift;
my $year = shift;
if ($year and $year != LDAP::get_year) {
if ($year and $year ne LDAP::get_year) {
croak "Impossible d'ajouter un projet d'une autre année : non implémenté";
}
my $res = API::Base::send('ResultHandler',
"projects/projects/add.xml",
[ project_name => $project_name ]);
[
project_name => $project_name,
flavor => $flavor,
]);
if ($res->{result} ne '0') {
croak "Erreur durant l'ajout : ".$res->{message};
@ -35,11 +39,17 @@ sub get($;$)
my $project_name = shift;
my $year = shift;
my $res = API::Base::get('ProjectMemberHandler',
"projects/projects/get/$project_name.xml");
my $url;
if ($year) {
$url = "projects/projects/get/$project_name/$year.xml";
} else {
$url = "projects/projects/get/$project_name.xml";
}
my $res = API::Base::get('ProjectHandler', $url);
if ($res->{result} ne '0') {
croak "Erreur durant l'ajout : " . $res->{message};
croak "Erreur durant la récupération du projet : " . $res->{message};
}
return $res;
@ -66,14 +76,38 @@ sub get_users($;$)
return $res;
}
sub get_groups($;$)
{
my $project_name = shift;
my $year = shift;
my $url;
if ($year) {
$url = "projects/groups/groups/$project_name/$year.xml";
} else {
$url = "projects/groups/groups/$project_name.xml";
}
my $res = API::Base::get('ProjectGroupHandler', $url);
if ($res->{result} ne '0') {
croak "Erreur durant la récupération : " . $res->{message};
}
return $res;
}
sub add_grades($;$)
{
my %data = (
project_name => shift
);
$data{year} = $_ if (shift);
my $y = shift;
if ($y) {
$data{year} = $y;
}
my $res = API::Base::get('ResultHandler', "projects/groups/generate.xml");
my $res = API::Base::send('ResultHandler', "projects/notes/add.xml", \%data);
if ($res->{result} ne '0') {
croak "Erreur durant l'ajout : " . $res->{message};
@ -88,7 +122,10 @@ sub add_traces($$;$)
project_name => shift,
trace_name => shift,
);
$data{year} = $_ if (shift);
my $y = shift;
if ($y) {
$data{year} = $y;
}
my $res = API::Base::send('ResultHandler', "projects/traces/add.xml", \%data);

View file

@ -5,10 +5,11 @@ package API::Submission;
use v5.10.1;
use strict;
use warnings;
use Carp;
use ACU::API::Base;
sub add($$$$$)
sub add
{
my $year = shift;
my $project = shift;
@ -18,15 +19,12 @@ sub add($$$$$)
my $res = API::Base::send('ResultHandler', "projects/submissions/add.xml", [ leader_login => $user, project_name => $project, year => $year, log => $log, tag => $tag ]);
if ($res->{result} == '0') {
say "Rendu ok";
}
else {
say "Rendu non ok : retour de l'API non nul.";
if ($res->{result} != '0') {
croak "Erreur durant le rendu : ".$res->{message};
}
}
sub get($$$$)
sub get
{
my $year = shift;
my $project = shift;

View file

@ -17,14 +17,16 @@ sub new ($$)
{
my $class = shift;
my $self = {
ids => {},
groups => [],
infos => {},
comments => {},
who => {},
};
bless $self, $class;
$self->_initialize(@_);
if ($#_ >= 0) {
$self->_initialize(@_);
}
return $self;
}
@ -33,10 +35,63 @@ sub _initialize ($$)
{
my $self = shift;
my $sax_handler = DefenseHandler->new($self);
my $parser = XML::SAX::ParserFactory->parser( Handler => $sax_handler );
my $dom = XML::LibXML->load_xml(string => shift);
$self->{groups} = $self->parseDefense($dom->documentElement());
$self->{version} = $dom->documentElement()->getAttribute("version") // "1";
$self->{duration} = $dom->documentElement()->getAttribute("duration") if $dom->documentElement()->hasAttribute("duration");
$self->{type} = $dom->documentElement()->getAttribute("type") if $dom->documentElement()->hasAttribute("type");
$self->{"strict-time"} = $dom->documentElement()->getAttribute("strict-time") if $dom->documentElement()->hasAttribute("strict-time");
$self->{"can-correct"} = $dom->documentElement()->getAttribute("can-correct") if $dom->documentElement()->hasAttribute("can-correct");
$self->{"operator"} = $dom->documentElement()->getAttribute("operator") if $dom->documentElement()->hasAttribute("operator");
}
$parser->parse_file(shift);
sub parseDefense ($$)
{
my $self = shift;
my $ret = [];
my $node = shift;
foreach my $group ($node->childNodes())
{
if ($group->nodeName eq "group")
{
my $g = Defense::Group->new(
$group->getAttribute("id"),
$group->getAttribute("title"),
$group->getAttribute("questions")
);
$g->addQuestion(
$g->parseQuestions($group->getElementsByTagName("question"))
);
push @$ret, $g;
}
}
return $ret;
}
sub toString ($)
{
my $self = shift;
my $doc = XML::LibXML::Document->new('1.0');
my $root = $doc->createElement("defense");
$root->addChild( $doc->createAttribute("version", $self->{version}) );
$root->addChild( $doc->createAttribute("duration", $self->{duration}) );
$root->addChild( $doc->createAttribute("type", $self->{type}) ) if ($self->{type});
$root->addChild( $doc->createAttribute("strict-time", $self->{"strict-time"}) ) if ($self->{"strict-time"});
$root->addChild( $doc->createAttribute("can-correct", $self->{"can-correct"}) ) if ($self->{"can-correct"});
$root->addChild( $doc->createAttribute("operator", $self->{"operator"}) ) if ($self->{"operator"});
for my $group (@{ $self->{groups} }) {
$group->toString($doc, $root, $root);
}
$doc->setDocumentElement( $root );
return $doc->toString();
}
sub getVersion ($)
@ -48,71 +103,371 @@ sub getVersion ($)
sub getIds ($)
{
my $self = shift;
return $self->{ids};
my %ids;
for my $group (@{ $self->{groups} })
{
$ids{ $group->{id} } = 1 if ($group->{id});
for my $question (@{ $group->{questions_list} })
{
$ids{ $question->{id} } = 1 if ($question->{id});
for my $answer (@{ $question->{answers} })
{
$ids{ $answer->{id} } = $answer->{value} // 0 if ($answer->{id});
}
}
}
return \%ids;
}
sub genIds ($;$)
{
my $self = shift;
my $def_i = shift // 1;
my @ids;
my $grp_i = 0;
for my $group (@{ $self->{groups} })
{
my $cur_gid;
if (! $group->{id} || grep { $_ == $group->{id} } @ids)
{
do {
$cur_gid = "def_".$def_i."g".$grp_i;
$grp_i += 1;
} while (grep {$_ eq $cur_gid} @ids);
$group->{id} = $cur_gid;
}
else {
$grp_i += 1;
$cur_gid = $group->{id};
}
my $qst_i = 0;
for my $question (@{ $group->{questions_list} })
{
my $cur_qid;
if (! $question->{id} || grep { $_ == $question->{id} } @ids)
{
do {
$cur_qid = $cur_gid."q".$qst_i;
$qst_i += 1;
} while (grep {$_ eq $cur_qid} @ids);
$question->{id} = $cur_qid;
}
else {
$qst_i += 1;
$cur_qid = $question->{id};
}
my $ans_i = 0;
for my $answer (@{ $question->{answers} })
{
if (! $answer->{id} || grep { $_ == $answer->{id} } @ids)
{
my $cur_aid;
do {
$cur_aid = $cur_qid."a".$ans_i;
$ans_i += 1;
} while (grep {$_ eq $cur_aid} @ids);
$answer->{id} = $cur_aid;
}
else {
$ans_i += 1;
}
}
}
}
}
package DefenseHandler;
package Defense::Group;
use v5.10.1;
use strict;
use warnings;
use Carp;
use constant NO_ID_VALUE => "__#";
use ACU::Log;
sub new ($$)
sub new
{
my $class = shift;
my $self = {
parsed => shift,
inComment => "",
inEval => "",
inInfo => "",
inValue => "",
inWho => "",
values => ""
id => shift,
title => shift,
questions => shift,
questions_list => []
};
bless $self, $class;
return $self;
return bless $self;
}
sub start_element
sub addQuestion($@)
{
my ($self, $element) = @_;
my $self = shift;
if ($element->{Name} eq "defense") {
$self->{parsed}{version} = $element->{Attributes}{"{}version"}{Value};
$self->{parsed}{duration} = $element->{Attributes}{"{}duration"}{Value};
push @{ $self->{questions_list} }, @_;
}
sub parseQuestions($@)
{
my $self = shift;
my @ret;
for my $question (@_)
{
my $expl;
$expl = @{ $question->getElementsByTagName("explanation") }[0]->textContent if $question->getElementsByTagName("explanation");
my $q = Defense::Question->new(
@{ $question->getElementsByTagName("ask") }[0]->textContent,
$expl // "",
$question->getAttribute("id"),
$question->getAttribute("title"),
$question->getAttribute("type"),
$question->getAttribute("difficulty"),
$question->getAttribute("weight"),
$question->getAttribute("imposed"),
$question->getAttribute("mandatory"),
$question->getAttribute("shuffled-answers")
);
$q->addAnswer(
$q->parseAnswers($question->getElementsByTagName("answer"))
);
$q->addInput(
$q->parseInputs($question->getElementsByTagName("input"))
);
push @ret, $q;
}
elsif ($element->{Name} eq "question") {
if ($element->{Attributes}{"{}id"}{Value}) {
$self->{parsed}{ids}{ $element->{Attributes}{"{}id"}{Value} } = 0;
}
else {
log WARN, "Question without ID!";
}
}
elsif ($element->{Name} eq "answer") {
if ($element->{Attributes}{"{}id"}{Value}) {
$self->{parsed}{ids}{ $element->{Attributes}{"{}id"}{Value} } = $element->{Attributes}{"{}value"}{Value} // $element->{Attributes}{"{}mark"}{Value} // 0;
}
else {
log WARN, "Answer without ID!";
}
}
elsif ($element->{Name} ne "group" && $element->{Name} ne "ask" && $element->{Name} ne "answer" && $element->{Name} ne "explanation") {
croak "Not a valid defense XML: unknown tag ".$element->{Name};
return @ret;
}
sub toString ($$$)
{
my $self = shift;
my $doc = shift;
my $parent = shift;
my $group = $doc->createElement("group");
$group->addChild( $doc->createAttribute("id", $self->{id}) );
$group->addChild( $doc->createAttribute("title", $self->{title}) );
$group->addChild( $doc->createAttribute("questions", $self->{questions}) ) if ($self->{questions});
$parent->appendChild($group);
for my $item (@{ $self->{questions_list} }) {
$item->toString($doc, $group);
}
}
sub characters
{
my ($self, $characters) = @_;
if ($self->{inValue} || $self->{inInfo} || $self->{inComment} || $self->{inWho}) {
$self->{values} .= $characters->{Data};
package Defense::Question;
use v5.10.1;
use strict;
use warnings;
use Carp;
sub new
{
my $class = shift;
my $self = {
ask => shift,
explanation => shift,
id => shift,
title => shift,
type => shift,
difficulty => shift,
weight => shift,
imposed => shift,
mandatory => shift,
"shuffled-answers" => shift,
answers => []
};
return bless $self;
}
sub addAnswer($@)
{
my $self = shift;
push @{ $self->{answers} }, @_;
}
sub addInput($@)
{
my $self = shift;
push @{ $self->{answers} }, @_;
}
sub parseAnswers($@)
{
my $self = shift;
my @ret;
for my $answer (@_)
{
my $a = Defense::Answer->new(
$answer->textContent,
$answer->getAttribute("id"),
$answer->getAttribute("value"),
$answer->getAttribute("next")
);
push @ret, $a;
}
return @ret;
}
sub parseInputs($@)
{
my $self = shift;
my @ret;
for my $input (@_)
{
my $a = Defense::Input->new(
$input->getAttribute("label"),
$input->getAttribute("id"),
$input->getAttribute("type"),
$input->getAttribute("value"),
$input->getAttribute("maxlength"),
$input->getAttribute("pattern"),
$input->getAttribute("placeholder"),
$input->getAttribute("min"),
$input->getAttribute("max"),
$input->getAttribute("step")
);
push @ret, $a;
}
return @ret;
}
sub toString ($$$)
{
my $self = shift;
my $doc = shift;
my $parent = shift;
my $question = $doc->createElement("question");
$question->addChild( $doc->createAttribute("id", $self->{id}) );
$question->addChild( $doc->createAttribute("title", $self->{title}) );
$question->addChild( $doc->createAttribute("type", $self->{type}) ) if ($self->{type});
$question->addChild( $doc->createAttribute("difficulty", $self->{difficulty}) ) if ($self->{difficulty});
$question->addChild( $doc->createAttribute("weight", $self->{weight}) ) if ($self->{weight});
$question->addChild( $doc->createAttribute("imposed", $self->{imposed}) ) if ($self->{imposed});
$question->addChild( $doc->createAttribute("mandatory", $self->{mandatory}) ) if ($self->{mandatory});
$question->addChild( $doc->createAttribute("shuffled-answers", $self->{"shuffled-answers"}) ) if ($self->{"shuffled-answers"});
$parent->appendChild($question);
my $ask = $doc->createElement("ask");
$ask->appendText($self->{ask});
$question->appendChild($ask);
for my $item (@{ $self->{answers} }) {
$item->toString($doc, $question);
}
if ($self->{explanation})
{
my $expl = $doc->createElement("explanation");
$expl->appendText($self->{explanation});
$question->appendChild($expl);
}
}
package Defense::Answer;
use v5.10.1;
use strict;
use warnings;
use Carp;
sub new
{
my $class = shift;
my $self = {
text => shift,
id => shift,
value => shift,
"next" => shift,
};
return bless $self;
}
sub toString ($$$)
{
my $self = shift;
my $doc = shift;
my $parent = shift;
my $answer = $doc->createElement("answer");
$answer->appendText($self->{text});
$answer->addChild( $doc->createAttribute("id", $self->{id}) );
$answer->addChild( $doc->createAttribute("value", $self->{value}) ) if ($self->{"value"});
$answer->addChild( $doc->createAttribute("next", $self->{"next"}) ) if ($self->{"next"});
$parent->appendChild($answer);
}
package Defense::Input;
use v5.10.1;
use strict;
use warnings;
use Carp;
sub new
{
my $class = shift;
my $self = {
label => shift,
id => shift,
type => shift,
value => shift,
maxlength => shift,
pattern => shift,
placeholder => shift,
min => shift,
max => shift,
step => shift
};
return bless $self;
}
sub toString ($$$)
{
my $self = shift;
my $doc = shift;
my $parent = shift;
my $answer = $doc->createElement("answer");
$answer->addChild( $doc->createAttribute("label", $self->{label}) );
$answer->addChild( $doc->createAttribute("id", $self->{id}) );
$answer->addChild( $doc->createAttribute("type", $self->{type}) ) if ($self->{"type"});
$answer->addChild( $doc->createAttribute("value", $self->{value}) ) if ($self->{"value"});
$answer->addChild( $doc->createAttribute("maxlength", $self->{maxlength}) ) if ($self->{"maxlength"});
$answer->addChild( $doc->createAttribute("pattern", $self->{pattern}) ) if ($self->{"pattern"});
$answer->addChild( $doc->createAttribute("placeholder", $self->{placeholder}) ) if ($self->{"placeholder"});
$answer->addChild( $doc->createAttribute("min", $self->{min}) ) if ($self->{"min"});
$answer->addChild( $doc->createAttribute("max", $self->{max}) ) if ($self->{"max"});
$answer->addChild( $doc->createAttribute("step", $self->{step}) ) if ($self->{"step"});
$parent->appendChild($answer);
}
1;

View file

@ -30,23 +30,25 @@ sub _initialize
{
my $self = shift;
my $dom = XML::LibXML->load_xml(IO => shift);
my $dom = XML::LibXML->load_xml(string => shift);
$self->{tree} = $self->parseGrade($dom->documentElement());
$self->{max} = $dom->documentElement()->getAttribute("max") // "20";
}
sub create_from_trace ($$)
sub create_from_ids
{
my $self = shift;
my $trace_id = shift;
my $trace_name = shift;
my $trace = shift;
my $ids = shift;
my $trace_id = $trace_name;
$trace_id =~ s/[^a-zA-Z0-9_]/_/g;
my $g = Grade->new($trace_id, $trace_name);
for my $id (sort( keys %{ $trace->{ids} } ))
for my $id (sort( keys %{ $ids } ))
{
my $p = Point->new($trace->{ids}{$id}, $id, 0, 0);
my $p = Point->new($ids->{$id}, $id, 0, 0);
push @{ $g->{tree} }, $p;
}
@ -107,7 +109,7 @@ sub insert ($$$)
$self->{ids}{$_[0]} = $_[1];
}
sub fill ($$)
sub fill
{
my $self = shift;
my $ids = shift;
@ -117,7 +119,7 @@ sub fill ($$)
}
}
sub to_string ($)
sub toString ($)
{
my $self = shift;
@ -133,7 +135,7 @@ sub to_string ($)
}
for my $grade (@{ $self->{tree} }) {
$grade->to_string($doc, $root, $root);
$grade->toString($doc, $root, $root);
}
$doc->setDocumentElement( $root );
@ -141,13 +143,14 @@ sub to_string ($)
return $doc->toString();
}
sub compute ($)
sub compute ($;$)
{
my $self = shift;
my $login = shift;
my $sum = 0;
for my $grade (@{ $self->{tree} }) {
my $tmp = $grade->compute($self->{operators}, $self->{ids});
my $tmp = $grade->compute($self->{operators}, $self->{ids}, $login);
$sum += $tmp if $tmp;
}
@ -157,20 +160,15 @@ sub compute ($)
sub computeXML ($;$)
{
my $self = shift;
my $sum = 0;
my $login = shift;
my $doc = XML::LibXML::Document->new('1.0');
my $root = $doc->createElement("grading");
my $final = $doc->createElement("grade");
for my $grade (@{ $self->{tree} }) {
my $tmp = $grade->compute($self->{operators}, $self->{ids}, $doc, $final);
$grade->compute($self->{operators}, $self->{ids}, $login, $doc, $root);
}
$final->addChild( $doc->createAttribute("value", $self->compute()) );
$final->addChild( $doc->createAttribute("name", "Note finale") );
$root->appendChild( $final );
$root->addChild( $doc->createAttribute("max", $self->{max}) );
$doc->setDocumentElement( $root );
@ -201,7 +199,7 @@ sub new ($$$;$$)
return bless $self;
}
sub to_string ($$$)
sub toString ($$$)
{
my $self = shift;
my $doc = shift;
@ -215,7 +213,7 @@ sub to_string ($$$)
$parent->appendChild($grade);
for my $item (@{ $self->{tree} }) {
$item->to_string($doc, $grade);
$item->toString($doc, $grade);
}
}
@ -226,11 +224,12 @@ sub append ($@)
push @{ $self->{tree} }, @_;
}
sub compute ($$$;$$)
sub compute ($$$;$$$)
{
my $self = shift;
my $operators = shift;
my $ids = shift;
my $login = shift;
my $doc = shift;
my $parent = shift;
my @current = ();
@ -240,13 +239,14 @@ sub compute ($$$;$$)
{
$grade = $doc->createElement("grade");
$grade->addChild( $doc->createAttribute("factor", $self->{factor}) );
$grade->addChild( $doc->createAttribute("name", $self->{title}) );
$grade->addChild( $doc->createAttribute("name", $self->{title}) ) if ($self->{title});
$parent->appendChild( $grade );
}
for my $node (@{ $self->{tree} }) {
my $t = $node->compute($operators, $ids, $doc, $grade);
push @current, $t if $t;
for my $node (@{ $self->{tree} })
{
my $t = $node->compute($operators, $ids, $login, $doc, $grade);
push @current, $t if (defined $t);
}
my $res;
@ -255,11 +255,11 @@ sub compute ($$$;$$)
my $operator = $self->{operator};
my $cpt = new Safe;
$cpt->permit_only(qw(:base_core :base_mem :base_loop padany));
$cpt->permit_only(qw(:base_core :base_mem :base_loop padany rv2gv));
$res = reduce {
$cpt->share('$a');
$cpt->share('$b');
$cpt->reval($operators->{ $operator }) or die $@;
$cpt->reval($operators->{ $operator }) // die "Safe alert: $@";
}
@current;
}
@ -273,7 +273,6 @@ sub compute ($$$;$$)
$grade->addChild( $doc->createAttribute("value", $res) ) if ($grade);
return $grade if ($grade);
return $res;
}
@ -287,8 +286,11 @@ package Point;
use v5.10.1;
use strict;
use warnings;
use Text::Glob qw( glob_to_regex match_glob );
use Term::ANSIColor qw(:constants);
use ACU::Log;
sub new ($$$$$)
{
my $class = shift;
@ -302,7 +304,7 @@ sub new ($$$$$)
return bless $self;
}
sub to_string ($$$)
sub toString ($$$)
{
my $self = shift;
my $doc = shift;
@ -316,47 +318,72 @@ sub to_string ($$$)
$parent->appendChild($point);
}
sub getValue ($$;$)
sub getValue ($$$)
{
my $self = shift;
my $ids = shift;
my $justMatch = shift;
my $ref = shift;
if (!$justMatch && !$ids->{ $self->{ref} } // 0) {
return 0;
}
elsif ($self->{value} eq "") {
return $ids->{ $self->{ref} } // 0;
}
else {
return $self->{value};
}
# Return the point node value if exists
return $self->{value} if ($self->{value} ne "");
# Else return pointed ref value
return $ids->{ $ref };
}
sub compute ($$$;$$)
sub compute ($$$;$$$)
{
my $self = shift;
my $operators = shift;
my $ids = shift;
my $ret = undef;
my $login = shift;
if ((not $self->{ref}) || $self->{ref} ~~ $ids) {
$ret = $self->getValue( $ids );
}
my $ref = $self->{ref};
if ($self->{not}) {
if ($ret) {
$ret = undef;
} else {
$ret = $self->getValue( $ids );
# Handle $LOGIN in ref
$ref =~ s/\$LOGIN/$login/ if ($login && $ref);
# Handle globbing in ref
if (defined $ref)
{
eval
{
if ($ref =~ /\?|\*/)
{
my $value = 0;
for my $r (grep { match_glob($ref, $_); } keys %$ids) {
$value += $ids->{ $r } if ($ref != $r);
}
$ids->{ $ref } = $value if ($value);
log DEBUG, "New globbing identifier caculated $ref: $value";
}
};
if ($@) {
my $err = $@;
log ERROR, $@;
}
}
my $ret = undef;
my $result = (
# No condition on refs nor qversion?
! defined $ref
# Condition on refs
|| grep { $ref eq $_ } keys %$ids
);
# Handel not
$result = !$result if ($self->{not});
# ret is valued only if all conditions passed
$ret = $self->getValue( $ids, $ref ) if ($result);
if ($main::debug)
{
my $str = "not=".($self->{not}//0).", qversion".($self->{qversion}//"*").", ref=".($self->{ref}//"").",\tvalue=".$self->getValue( $ids, 1 ).", got=".($ret // 0);
if ($ret) {
say GREEN, ">>>", RESET, " Matching point: ", $str;
my $str = "not=".($self->{not}//0).", qversion".($self->{qversion}//"*").", ref=".($ref//"").",\tvalue=".($ids->{ $ref//"" } // "undef");
if ($result) {
say GREEN, ">>>", RESET, " Matching point: ", $str, ", ", BOLD, "got=".($ret // 0), RESET;
} else {
say RED, " * ", RESET, " Skipped point: ", $str;
}
@ -365,5 +392,4 @@ sub compute ($$$;$$)
return $ret;
}
1;

71
ACU/Jail.pm Normal file
View file

@ -0,0 +1,71 @@
#! /usr/bin/env perl
package Jail;
use v5.10.1;
use strict;
use warnings;
use Carp;
use File::Temp qw(tempdir);
use File::Path qw(remove_tree);
use File::Copy::Recursive qw(dircopy);
use ACU::Log;
use constant {
JAILS_DIR => "/jail/",
RULESET_NO => 4,
};
sub run_command
{
my $jail = shift;
my $command = shift;
my $readonly = shift;
my $work_dir = shift;
# Verifications
croak JAILS_DIR . "$jail doesn't exist." unless ( -d JAILS_DIR . $jail);
croak JAILS_DIR . "$jail/data doesn't exist." unless ( -d JAILS_DIR . "$jail/data");
my $jail_path = JAILS_DIR . $jail;
my $mounts = "";
if ($readonly) {
$jail_path = tempdir();
$mounts = "mount='" . JAILS_DIR . "$jail $jail_path nullfs ro 0 0' ";
}
$mounts .= "mount='tmpfs $jail_path/tmp tmpfs rw,mode=777 0 0' ";
my $jail_data_path = "$jail_path/data";
# Creating the working directory
if (defined ($work_dir) and $work_dir ne "") {
$mounts .= "mount='$work_dir $jail_data_path nullfs rw 0 0' ";
}
# Create and start jail
my $jail_cmd = "jail -c path='$jail_path' ";
$jail_cmd .= "persist=false ";
$jail_cmd .= "devfs_ruleset=". RULESET_NO ." ";
$jail_cmd .= "$mounts";
if (defined ($work_dir) and $work_dir ne "") {
$jail_cmd .= "exec.start='cd $jail_data_path && $command'";
} else {
$jail_cmd .= "exec.start='$command'";
}
system($jail_cmd);
croak "Error while executing '$jail_cmd'" if ($?);
# Force umount
system("umount -f $jail_path/tmp");
if (defined ($work_dir) and $work_dir ne "") {
system("umount -f $jail_data_path");
}
if ($readonly) {
system("umount -f $jail_path");
}
}
1;

View file

@ -5,23 +5,34 @@ package LDAP;
use v5.10.1;
use strict;
use warnings;
use Carp;
use Net::LDAPS;
use Net::LDAP::Filter;
use Net::LDAP::Util qw(ldap_error_text);
use ACU::Password;
use ACU::Right;
use ACU::Log;
use constant {
BASE_DN => "dc=acu,dc=epita,dc=fr",
YEAR_DN => "cn=year,dc=acu,dc=epita,dc=fr",
};
## Connection functions
our $ldaphost = "ldap.acu.epita.fr";
our $binddn = "cn=intra,dc=acu,dc=epita,dc=fr";
our $binddn = "cn=intra," . BASE_DN;
my $bindsecret = "";
sub ldap_get_password
{
return Password::get_password "/home/2014/mercie_d/.secret_ldap";
if (`hostname` eq "apl") {
return Password::get_password "/home/2014/mercie_d/.secret_ldap";
} else {
return Password::get_password "/home/intradmin/.secret_ldap";
}
}
our $secret_search = \&ldap_get_password;
@ -37,9 +48,7 @@ sub ldap_connect()
log(DEBUG, "Connect to LDAP with $binddn");
if ($mesg->code) {
log(FATAL, "An error occurred: " .ldap_error_text($mesg->code));
}
croak ldap_error_text($mesg->code) if ($mesg->code);
return $ldap;
}
@ -51,9 +60,7 @@ sub ldap_connect_anon()
log(DEBUG, "Connect to LDAP anonymously");
if ($mesg->code) {
log(FATAL, "An error occurred: " .ldap_error_text($mesg->code));
}
croak ldap_error_text($mesg->code) if ($mesg->code);
return $ldap;
}
@ -68,7 +75,7 @@ sub add_group($$$;$)
my $year = shift // get_year();
my $ou = shift // "intra"; # expected roles or intra
my $dn = "cn=$cn,ou=$year,ou=$ou,ou=groups,dc=acu,dc=epita,dc=fr";
my $dn = "cn=$cn,ou=$year,ou=$ou,ou=groups," . BASE_DN;
log(DEBUG, "Add group $dn");
@ -83,34 +90,95 @@ sub add_group($$$;$)
return $dn;
}
sub delete_group($$;$)
{
my $cn = shift;
my $year = shift;
my $ou = shift // "intra"; # expected roles or intra
my $ldap = ldap_connect();
log(DEBUG, "Delete group ou=groups,dc=acu,dc=epita,dc=fr");
my $mesg = $ldap->search( # search
base => "ou=groups,dc=acu,dc=epita,dc=fr",
filter => "cn=$cn",
scope => "sub"
);
if ($mesg->code != 0) { log(WARN, $mesg->error); return 0; }
if ($mesg->count != 1) { log(WARN, "$cn not found or multiple entries match"); return 0; }
$ldap->delete( $mesg->entry(0)->dn );
$ldap->unbind or log(WARN, "couldn't disconnect correctly");
}
sub get_year(;$)
{
my $ldap = shift // ldap_connect_anon();
return get_attribute($ldap, "cn=year,dc=acu,dc=epita,dc=fr", "year");
return get_attribute($ldap, YEAR_DN, "year");
}
sub get_rights($)
{
my $login = shift;
my @rights;
my $ldap = ldap_connect_anon();
my $mesg = $ldap->search( # search
base => "ou=roles,ou=groups," . BASE_DN,
filter => Net::LDAP::Filter->new("&(memberUid=$login)(objectClass=intraGroup)"),
attrs => [ 'intraRight' ],
scope => "sub"
);
if ($mesg->code != 0) { die $mesg->error; }
for my $entry ($mesg->entries)
{
for my $r ($entry->get_value('intraRight'))
{
if ($r =~ /^!(.*)$/) {
@rights = grep { $r ne $_ } @rights;
}
else {
push @rights, Right->new($r);
}
}
}
$mesg = $ldap->search( # search
base => "ou=intra,ou=groups," . BASE_DN,
filter => Net::LDAP::Filter->new("&(memberUid=$login)(objectClass=intraGroup)"),
attrs => [ 'intraRight' ],
scope => "sub"
);
if ($mesg->code != 0) { die $mesg->error; }
if ($mesg->count != 1) { die "User $login not found or multiple presence"; }
for my $entry ($mesg->entries)
{
for my $r ($entry->get_value('intraRight')) {
push @rights, Right->new($r);
}
}
$mesg = $ldap->search( # search
base => "ou=users," . BASE_DN,
filter => Net::LDAP::Filter->new("&(uid=$login)(objectClass=intraAccount)"),
attrs => [ 'intraRight' ],
scope => "sub"
);
if ($mesg->code != 0) { die $mesg->error; }
if ($mesg->count != 1) { die "User $login not found or multiple presence"; }
for my $r ($mesg->entry(0)->get_value('intraRight')) {
push @rights, Right->new($r);
}
$ldap->unbind or die ("couldn't disconnect correctly");
return @rights;
}
sub has_right($$)
{
my $login = shift;
my $right = shift;
my $ok = 0;
for my $r (get_rights($login))
{
if ($r->{right} eq $right)
{
return 0 if ($r->{negate});
$ok = $r;
}
}
return $ok;
}
@ -121,13 +189,16 @@ sub get_dn($$@)
my $ldap = shift // ldap_connect();
my $dn = shift;
my $base = BASE_DN;
$dn = "$dn," . BASE_DN if ($dn !~ /$base$/);
my $mesg = $ldap->search( # search
base => "$dn",
filter => "(objectClass=*)",
filter => Net::LDAP::Filter->new("(objectClass=*)"),
attrs => \@_,
scope => "sub"
scope => "base"
);
if ($mesg->code != 0) { log(WARN, $mesg->error); return undef; }
return undef if ($mesg->code != 0);
if ($mesg->count != 1) { log(WARN, "$dn not found or multiple entries match"); return undef; }
return $mesg->entry(0);
@ -150,7 +221,8 @@ sub add_attribute($$$@)
my @data = $entry->get_value($what);
for my $value (@_)
{
if (! grep { /^\Q$value\E$/ } @data) {
if (! grep { $value eq $_ } @data)
{
$mod = 1;
log(DEBUG, "Add attribute $value to $dn");
@ -188,10 +260,11 @@ sub delete_attribute($$$@)
my @data = $entry->get_value($what);
for my $value (@_)
{
if (grep { /^\Q$value\E$/ } @data) {
if (grep { $value eq $_ } @data)
{
log(DEBUG, "Remove attribute $what ($value) from $dn");
@data = grep { ! /^\Q$value\E$/ } @data;
@data = grep { $value ne $_ } @data;
$mod = 1;
}
else {
@ -227,7 +300,7 @@ sub flush_attribute($$@)
my $ldap = shift // ldap_connect();
my $dn = shift;
my $mesg = $ldap->modify($dn, delete => \@_)->code;
my $mesg = $ldap->modify($dn, delete => \@_);
if ($mesg->code != 0) { log(WARN, $mesg->error); return 0; }
@ -251,18 +324,19 @@ sub search_dn($$@)
my $base = shift;
my $filter = shift;
if ($base) {
$base .= ","
}
$base .= "," if ($base);
log (DEBUG, "Looking for $filter in $base" . BASE_DN);
my $mesg = $ldap->search( # search
base => $base."dc=acu,dc=epita,dc=fr",
filter => $filter,
base => $base . BASE_DN,
filter => Net::LDAP::Filter->new($filter),
attrs => [ ],
scope => "sub"
);
if ($mesg->code != 0) { log(WARN, $mesg->error); return undef; }
if ($mesg->count != 1) { log(WARN, "$filter not found or multiple entries match"); return undef; }
return undef if ($mesg->code != 0);
croak("$filter not found") if ($mesg->count == 0);
croak("$filter not unique") if ($mesg->count > 1);
return $mesg->entry(0)->dn;
}
@ -273,17 +347,15 @@ sub search_dns($$$@)
my $base = shift;
my $filter = shift;
if ($base) {
$base .= ","
}
$base .= "," if ($base);
my $mesg = $ldap->search( # search
base => $base."dc=acu,dc=epita,dc=fr",
filter => $filter,
attrs => @_,
base => $base . BASE_DN,
filter => Net::LDAP::Filter->new($filter),
attrs => \@_,
scope => "sub"
);
if ($mesg->code != 0) { log(WARN, $mesg->error); return undef; }
if ($mesg->code != 0) { log(WARN, $mesg->error); return []; }
return $mesg->entries;
}
@ -306,84 +378,4 @@ sub update_attribute($$$@)
return 1;
}
sub has_right($$)
{
my $login = shift;
my $right = shift;
my $ok = 0;
for my $r (get_rights($login)) {
if ($r->{right} eq $right) {
return 0 if ($r->{negate});
$ok = $r;
}
}
return $ok;
}
sub get_rights($)
{
my $login = shift;
my @rights;
my $ldap = ldap_connect_anon();
my $mesg = $ldap->search( # search
base => "ou=roles,ou=groups,dc=acu,dc=epita,dc=fr",
filter => "&(memberUid=$login)(objectClass=intraGroup)",
attrs => [ 'intraRight' ],
scope => "sub"
);
if ($mesg->code != 0) { die $mesg->error; }
for my $entry ($mesg->entries) {
for my $r ($entry->get_value('intraRight')) {
if ($r =~ /^!(.*)$/) {
@rights = grep { ! /^\Q$r\E$/ } @rights;
}
else {
push @rights, Right->new($r);
}
}
}
$mesg = $ldap->search( # search
base => "ou=intra,ou=groups,dc=acu,dc=epita,dc=fr",
filter => "&(memberUid=$login)(objectClass=intraGroup)",
attrs => [ 'intraRight' ],
scope => "sub"
);
if ($mesg->code != 0) { die $mesg->error; }
if ($mesg->count != 1) { die "User $login not found or multiple presence"; }
for my $entry ($mesg->entries) {
for my $r ($entry->get_value('intraRight')) {
push @rights, Right->new($r);
}
}
$mesg = $ldap->search( # search
base => "ou=users,dc=acu,dc=epita,dc=fr",
filter => "&(uid=$login)(objectClass=intraAccount)",
attrs => [ 'intraRight' ],
scope => "sub"
);
if ($mesg->code != 0) { die $mesg->error; }
if ($mesg->count != 1) { die "User $login not found or multiple presence"; }
for my $r ($mesg->entry(0)->get_value('intraRight')) {
push @rights, Right->new($r);
}
$ldap->unbind or die ("couldn't disconnect correctly");
return @rights;
}
1;

View file

@ -3,6 +3,11 @@ package ACU::Log;
use v5.10.1;
use strict;
use warnings;
use Carp;
use utf8;
use open IO => ':utf8';
use open ':std';
use Data::Dumper;
use Exporter 'import';
use POSIX qw(strftime);
@ -10,61 +15,120 @@ use Term::ANSIColor qw(:constants);
use constant {
FATAL => 1,
ERROR2 => 2,
ALERT => 2,
ERROR => 3,
WARN4 => 4,
WARN => 5,
WARN => 4,
DONE => 5,
USAGE => 6,
PENDING => 6.5,
INFO => 7,
DEBUG => 8,
TRACE => 9,
};
our @EXPORT = qw(log FATAL ERROR2 ERROR WARN4 WARN USAGE INFO DEBUG TRACE);
our @EXPORT = qw(log FATAL ALERT ERROR WARN DONE USAGE PENDING INFO DEBUG TRACE);
our $display_level = 7;
our $save_level = 9;
our $fatal_error = 1;
our $fatal_warn = 0;
our $mail_error = 0;
our $log_file = $0.".log";
my $log_fd;
sub log($@)
my $HOSTNAME = `hostname`;
chomp($HOSTNAME);
sub log
{
my $level = shift;
if ($#_ < 0) { return; }
if (!$_[0]) {
$Carp::Verbose = 1;
croak "Empty log message, this should not append!";
}
if (!$log_fd && $log_file) {
open ($log_fd, ">>", $log_file) or die("Unable to open log ($log_file) file for writing");
open ($log_fd, ">>", $log_file) or croak("Unable to open log ($log_file) file for writing");
# Enable autoflush for the log file
my $previous_default = select($log_fd);
$|++;
select($previous_default);
say $log_fd strftime("%a %b %e %H:%M:%S %Y", localtime), " START new logging session ";
}
if ($level <= $save_level and $log_fd) {
if ($level <= $save_level and $log_fd)
{
print $log_fd strftime("%a %b %e %H:%M:%S %Y", localtime), " ", levelstr($level), " ";
if ($level >= TRACE) {
if ($level == TRACE) {
print $log_fd Dumper(@_);
}
else {
say $log_fd @_;
}
}
if ($level <= $display_level) {
say STDERR (leveldisp($level), @_, RESET);
if ($mail_error && $level <= ERROR)
{
require Email::MIME;
require Email::Sender::Simple;
Email::Sender::Simple->import(qw(sendmail));
my $mail = Email::MIME->create(
header_str => [
From => "Roots assistants <root\@$HOSTNAME.acu.epita.fr>",
To => "Roots assistants <ml-root\@acu.epita.fr>",
Subject => "[LERDORF][ERROR] ".join(' ', @_)
],
attributes => {
encoding => 'quoted-printable',
charset => 'utf-8',
format => 'flowed',
},
body_str => "Bonjour,
Une erreur de niveau $level est survenue sur la machine $HOSTNAME.
Cette erreur est survenue lors de l'exécution du script :
$0.
Voici le contenu du message d'erreur :
".join(' ', @_)."
Cordialement,
--
The lerdorf project",
);
sendmail($mail);
}
if ($level <= $display_level)
{
$|++; # Autoflush STDOUT
if ($level == PENDING) {
print STDERR (leveldisp($level), @_, RESET, "\r");
} else {
say STDERR (leveldisp($level), @_, RESET);
}
$|--; # Disable autoflush
}
if ($fatal_warn && $level <= WARN){
#TODO Thibaut
#log(INFO, "Program stopped due to warning");
exit 125;
}
elsif ($fatal_error && $level <= ERROR) {
#TODO Thibaut
#log(INFO, "Program stopped due to error");
exit 126;
}
elsif ($level <= FATAL) {
#TODO Thibaut
#log(INFO, "Program stopped due to fatal error");
exit 127;
}
@ -74,12 +138,14 @@ sub levelstr($)
{
my $level = shift;
return "FATAL" if ($level == 1);
return "ERROR" if ($level == 3 or $level == 2);
return "WARN " if ($level == 5 or $level == 4);
return "USAGE" if ($level == 6);
return "INFO " if ($level == 7);
return "DEBUG" if ($level == 8);
return "FATAL" if ($level <= 1);
return "ALERT" if ($level <= 2);
return "ERROR" if ($level <= 3);
return "WARN " if ($level <= 4);
return "DONE " if ($level <= 5);
return "USAGE" if ($level <= 6);
return "INFO " if ($level <= 7);
return "DEBUG" if ($level <= 8);
return "TRACE";
}
@ -87,13 +153,15 @@ sub leveldisp($)
{
my $level = shift;
return BOLD, ON_RED, YELLOW, "/!\\", RESET, " ", BOLD if ($level == 1);
return BOLD, ON_RED, ">>>", RESET, " ", BOLD if ($level == 2);
return BOLD, RED, ">>>", RESET, " ", BOLD if ($level == 3);
return BOLD, YELLOW, ">>>", RESET, " ", BOLD if ($level == 5 or $level == 4);
return BOLD, MAGENTA, " * ", RESET, " ", BOLD if ($level == 6);
return BOLD, ON_RED, YELLOW, "/!\\", RESET, " ", BOLD if ($level <= 1);
return BOLD, ON_RED, ">>>", RESET, " ", BOLD if ($level <= 2);
return BOLD, RED, ">>>", RESET, " ", BOLD if ($level <= 3);
return BOLD, YELLOW, ">>>", RESET, " ", BOLD if ($level <= 4);
return BOLD, GREEN, ">>>", RESET, " ", BOLD if ($level <= 5);
return BOLD, MAGENTA, " * ", RESET, " ", BOLD if ($level <= 6);
return BOLD, CYAN, ">>>", RESET, " " if ($level < 7);
return BOLD, CYAN, " * ", RESET, " " if ($level == 7);
return BOLD, BLUE, " % ", RESET, " " if ($level == 8);
return BOLD, BLUE, " % ", RESET, " " if ($level <= 8);
return BOLD, BLUE, "#", RESET, " ";
}

View file

@ -22,6 +22,18 @@ our $nb_cpus = 0;
$nb_cpus = grep {/^processor\s/} <$cpuinfo>;
close $cpuinfo;
our @servers = ("gearmand-srv:4730");
sub add_server
{
push @servers, @_;
}
sub set_servers
{
@servers = @_;
}
sub check_load ($)
{
my $priority = shift;
@ -62,9 +74,62 @@ sub do_work ($$$@)
my $sax_handler = ProcessHandler->new($args);
my $parser = XML::SAX::ParserFactory->parser( Handler => $sax_handler );
$parser->parse_string(${ $_[0]{argref} });
eval {
$parser->parse_string(${ $_[0]{argref} });
};
if ($@) {
my $err = "Parse error: $@";
log ERROR, $err;
return $err;
}
return $subref->($given_args, $args);
my $ret = "";
eval {
$SIG{'__WARN__'} = sub { log WARN, $_[0]; $ret .= ">>> ".$_[0 ]; };
$ret .= $subref->($given_args, $args);
};
if ($@) {
my $err = $@;
log ERROR, $err;
$ret .= $err;
}
return $ret;
}
sub register_no_parse ($$;$)
{
my $funcname = shift;
my $subref = shift;
my $given_arg = shift;
my $worker = Gearman::Worker->new;
log INFO, "Registering function $funcname on ", join(", ", @servers);
$worker->job_servers( @servers );
$worker->register_function($funcname => sub
{
my $ret;
eval {
$ret = $subref->($given_arg, $_[0]{argref});
};
if ($@) {
my $err = $@;
log ERROR, $err;
return $err;
}
return $ret;
});
# Disable exit on warning or error
$ACU::Log::fatal_warn = 0;
$ACU::Log::fatal_error = 0;
log INFO, "$funcname registered";
$worker->work while 1;
}
sub register ($$;$$)
@ -76,14 +141,16 @@ sub register ($$;$$)
my $worker = Gearman::Worker->new;
$worker->job_servers('gearmand:4730');
log INFO, "Registering function $funcname on ", join(", ", @servers);
$worker->job_servers( @servers );
$worker->register_function($funcname => sub { return do_work($subref, $given_arg, $priority, @_); });
# Disable exit on warning or error
$ACU::Log::fatal_warn = 0;
$ACU::Log::fatal_error = 0;
log DEBUG, "$funcname registered";
log INFO, "$funcname registered";
$worker->work while 1;
}
@ -106,7 +173,7 @@ sub build_task_xml($;$)
my $files = shift;
my $doc = XML::LibXML::Document->new('1.0');
my $root = $doc->createElement("sync_ssh_keys");
my $root = $doc->createElement("process");
$doc->setDocumentElement( $root );
log TRACE, $params;
@ -145,7 +212,7 @@ sub launch ($$;$$)
my $funcname = shift;
my $client = Gearman::Client->new;
$client->job_servers('gearmand:4730');
$client->job_servers( @servers );
log DEBUG, "Launching $funcname...";
@ -168,7 +235,7 @@ sub paralaunch ($$;$)
my $xml = build_task_xml(shift, shift);
my $client = Gearman::Client->new;
$client->job_servers('gearmand:4730');
$client->job_servers( @servers );
my $taskset = $client->new_task_set;
for my $task (@{ $funcsname })
@ -272,6 +339,30 @@ sub getFirstChild ($)
return $self->{children}[0];
}
sub recreateNode
{
my $self = shift;
my $doc = shift;
my $parent = shift;
my $node = $doc->createElement($self->{nodeName});
for my $attkey (keys %{ $self->{attributes} })
{
$node->addChild( $doc->createAttribute($attkey, $self->{attributes}{ $attkey }) );
}
for my $child (@{ $self->{children} })
{
$child->recreateNode($doc, $node);
}
if ($self->{nodeValue}) {
$node->appendText( $self->{nodeValue} );
}
$parent->appendChild($node);
}
package ProcessHandler;
@ -351,7 +442,6 @@ sub end_element
{
my $item = pop @{ $self->{subtreeStack} };
$item->{nodeValue} .= $self->{values};
$item->{nodeValue} =~ s/\n+/ /g;
$item->{nodeValue} =~ s/ +/ /g;
if (@{ $self->{subtreeStack} } > 0) {
push @{ $self->{subtreeStack}[-1]->{children} }, $item;

183
ACU/Project.pm Normal file
View file

@ -0,0 +1,183 @@
#! /usr/bin/env perl
package Project;
use v5.10.1;
use strict;
use warnings;
use Carp;
use XML::LibXML;
use XML::SAX::ParserFactory;
use ACU::Log;
package ProjectHandler;
use strict;
use warnings;
use Carp;
my @stack_tags = (
"manager",
"submission",
"slides",
"subject",
"tutorial",
);
my @stackonce_tags = (
"period",
"upload",
"vcs",
"news",
"documents",
);
my @value_tags = (
"result",
"message",
"name",
"firstname",
"lastname",
"login",
"begin",
"end",
"date",
"tag",
"newsgroup"
);
sub new ($$)
{
my $class = shift;
my $self = {
parsed => shift,
saveChars => 0,
stack => [],
values => ""
};
bless $self, $class;
return $self;
}
sub start_element
{
my ($self, $element) = @_;
if ($element->{Name} eq "project" || $element->{Name} eq "Project") {
$self->{parsed}{name} = $element->{Attributes}{"{}name"}{Value} if ($element->{Attributes}{"{}name"});
}
elsif (grep { $element->{Name} eq $_ } @stack_tags)
{
my $data = {};
$data->{name} = $element->{Attributes}{"{}name"}{Value} if ($element->{Attributes}{"{}name"});
$data->{type} = $element->{Attributes}{"{}type"}{Value} if ($element->{Attributes}{"{}type"});
$data->{written_in} = $element->{Attributes}{"{}written_in"}{Value} if ($element->{Attributes}{"{}written_in"});
push @{ $self->{stack} }, $data;
}
elsif (grep { $element->{Name} eq $_ } @value_tags) {
$self->{saveChars} = 1;
$self->{values} = "";
}
elsif ($element->{Name} eq "vcs") {
push @{ $self->{stack} }, {
url => $element->{Attributes}{"{}url"}{Value},
tag => $element->{Attributes}{"{}tag"}{Value},
token => $element->{Attributes}{"{}token"}{Value} // 0,
quota => $element->{Attributes}{"{}quota"}{Value} // 20,
type => $element->{Attributes}{"{}type"}{Value} // "git",
};
}
elsif ($element->{Name} eq "upload") {
push @{ $self->{stack} }, {
format => $element->{Attributes}{"{}format"}{Value},
url => $element->{Attributes}{"{}url"}{Value},
identifier => $element->{Attributes}{"{}identifier"}{Value},
quota => $element->{Attributes}{"{}quota"}{Value} // 10,
};
}
elsif (grep { $element->{Name} eq $_ } @stackonce_tags) {
push @{ $self->{stack} }, { };
}
}
sub characters
{
my ($self, $characters) = @_;
if ($self->{saveChars}) {
$self->{values} .= $characters->{Data};
}
}
sub end_element
{
my ($self, $element) = @_;
if ($self->{saveChars})
{
if (@{ $self->{stack} } == 0) {
$self->{parsed}{$element->{Name}} = $self->{values};
}
else {
my $pop = pop @{ $self->{stack} };
$pop->{$element->{Name}} = $self->{values};
push @{ $self->{stack} }, $pop;
}
$self->{saveChars} = 0;
}
elsif (grep { $element->{Name} eq $_ } @stack_tags)
{
my $item = pop @{ $self->{stack} };
my $pop = pop @{ $self->{stack} };
if ($element->{Name} eq "submission") {
push @{ $self->{stack} }, $pop;
$item->{doc} = "$pop->{name}";
$pop = undef;
}
if ($pop)
{
if (!exists $pop->{$element->{Name}."s"}) {
$pop->{$element->{Name}."s"} = [];
}
push @{ $pop->{$element->{Name}."s"} }, $item;
push @{ $self->{stack} }, $pop;
}
else
{
if (!exists $self->{parsed}{$element->{Name}."s"}) {
$self->{parsed}{$element->{Name}."s"} = [];
}
push @{ $self->{parsed}{$element->{Name}."s"} }, $item;
}
}
elsif (grep { $element->{Name} eq $_ } @stackonce_tags)
{
my $item = pop @{ $self->{stack} };
my $pop = pop @{ $self->{stack} };
if ($pop)
{
$pop->{$element->{Name}} = $item;
push @{ $self->{stack} }, $pop;
}
else {
$self->{parsed}{$element->{Name}} = $item;
}
}
else {
return;
}
}
1;

View file

@ -9,20 +9,21 @@ use Carp;
use utf8;
use open qw(:encoding(UTF-8) :std);
use XML::LibXML;
use XML::SAX::ParserFactory;
sub new ($$)
use ACU::Log;
sub new
{
my $class = shift;
my $self = {
ids => {},
infos => {},
comments => {},
who => {},
groups => [],
};
bless $self, $class;
$self->_initialize(@_);
if ($#_ >= 0) {
$self->_initialize(@_);
}
return $self;
}
@ -31,10 +32,47 @@ sub _initialize ($$)
{
my $self = shift;
my $sax_handler = TraceHandler->new($self);
my $parser = XML::SAX::ParserFactory->parser( Handler => $sax_handler );
my $dom = XML::LibXML->load_xml(string => shift);
$self->{groups} = $self->parseTrace($dom->documentElement());
$self->{type} = $dom->documentElement()->getAttribute("type") // "mill";
$self->{version} = $dom->documentElement()->getAttribute("version") // 1;
}
$parser->parse_file(shift);
sub parseTrace($$)
{
my $self = shift;
my $tree = shift;
my $ret = [];
foreach my $node ($tree->childNodes())
{
if ($node->nodeName eq "info")
{
my $tmp = $node->textContent;
chomp($tmp);
$self->{infos}{ $node->getAttribute("name") } = $tmp;
}
elsif ($node->nodeName eq "group")
{
my $g = Trace::Group->new(
$node->getAttribute("id"),
$node->getAttribute("name")
);
$g->append(@{ $self->parseTrace($node) });
push @$ret, $g;
}
elsif ($node->nodeName eq "eval")
{
my $e = Trace::Eval->new(
$node->getAttribute("id"),
$node->getAttribute("type"),
$node
);
push @$ret, $e;
}
}
return $ret;
}
sub getVersion ($)
@ -61,66 +99,148 @@ sub getInfos ($)
return $self->{infos};
}
sub getComment ($$)
sub addId
{
my $self = shift;
return $self->{comments}{$_[0]};
my $key = shift;
my $value = shift;
my $e = Trace::Eval->new($key);
$e->addValue(undef, $value);
push @{ $self->{groups} }, $e;
return $e;
}
sub getComments ($)
sub delId
{
my $self = shift;
return $self->{comments};
my $key = shift;
my $value = shift;
foreach my $group (@{ $self->{groups} })
{
if ($group->{id} eq $key)
{
if (!$value || $value == $group->getValue())
{
$self->{groups} = [ grep { $_->{id} ne $key } @{ $self->{groups} } ];
}
last;
}
$group->delId($key, $value);
}
}
sub getIds
{
my $self = shift;
my $login = shift;
my $onlyNonZero = shift // 0;
my %ids;
foreach my $group (@{ $self->{groups} })
{
my %tmp;
if ($self->{type} eq "defense")
{
# For a defense, we consider that this is a group grade, so don't consider login filtering
%tmp = $group->getIds();
} else {
%tmp = $group->getIds($login);
}
while (my ($key, $value) = each %tmp)
{
$ids{$key} = $value if !$onlyNonZero || $value;
}
}
return \%ids;
}
sub getNonZeroIds
{
return getIds($_[0], $_[1], 1);
}
sub getValue
{
my $self = shift;
my $id = shift;
my $login = shift;
my $value = 0;
foreach my $group (@{ $self->{groups} })
{
$value += $group->getValue($id, $login);
}
return $value;
}
sub getWho ($$)
{
my $self = shift;
return $self->{who}{$_[0]};
return $self->getWhos()->{$_[0]};
}
sub getFirstWho ($)
{
my $self = shift;
return $self->{who}{def1_end_group};
return $self->getWhos()->{def1_end_group};
}
sub getWhos ($)
sub getWhos
{
my $self = shift;
return $self->{who};
my $ret = {};
foreach my $group (@{ $self->{groups} })
{
my $whos = $group->getWhos();
foreach my $who (keys %{ $whos }) {
$ret->{ $who } = $whos->{$who};
}
}
return $ret;
}
sub getValue ($$)
sub toString ($)
{
my $self = shift;
return $self->{ids}{$_[0]};
}
sub getIds ($)
{
my $self = shift;
return $self->{ids};
my $doc = XML::LibXML::Document->new('1.0');
my $root = $doc->createElement("trace");
foreach my $group (@{ $self->{groups} })
{
$root->appendChild( $group->toString($doc) );
}
$doc->setDocumentElement( $root );
return $doc->toString();
}
package TraceHandler;
package Trace::Group;
use v5.10.1;
use strict;
use warnings;
use Carp;
use constant NO_ID_VALUE => "__#";
use ACU::Log;
sub new ($$)
{
my $class = shift;
my $self = {
parsed => shift,
inComment => "",
inEval => "",
inInfo => "",
inValue => "",
inWho => "",
values => ""
id => shift,
name => shift,
groups => []
};
bless $self, $class;
@ -128,98 +248,273 @@ sub new ($$)
return $self;
}
sub start_element
sub append ($@)
{
my ($self, $element) = @_;
my $self = shift;
if ($element->{Name} eq "trace") {
$self->{parsed}{version} = $element->{Attributes}{"{}version"}{Value};
$self->{parsed}{type} = $element->{Attributes}{"{}type"}{Value};
}
elsif ($element->{Name} eq "info") {
$self->{inInfo} = $element->{Attributes}{"{}name"}{Value};
$self->{parsed}{infos}{ $self->{inInfo} } = 0;
$self->{values} = "";
}
elsif ($element->{Name} eq "eval") {
my $tmp = $element->{Attributes}{"{}id"}{Value};
if ($tmp) {
$self->{inEval} = $tmp;
$self->{parsed}{ids}{ $self->{inEval} } = 0;
}
}
elsif ($element->{Name} eq "comment" && $self->{inEval}) {
$self->{inComment} = $self->{inEval};
$self->{values} = "";
}
elsif ($element->{Name} eq "who" && $self->{inEval}) {
$self->{inWho} = $self->{inEval};
$self->{values} = "";
}
elsif ($element->{Name} eq "value") {
if ($element->{Attributes}{"{}id"}{Value}) {
$self->{inValue} = $element->{Attributes}{"{}id"}{Value};
} else {
$self->{inValue} = NO_ID_VALUE;
}
$self->{values} = "";
}
elsif ($element->{Name} ne "group" && $element->{Name} ne "name" && $element->{Name} ne "statut" && $element->{Name} ne "status" && $element->{Name} ne "log") {
croak "Not a valid trace XML: unknown tag ".$element->{Name};
}
push @{ $self->{groups} }, @_;
}
sub characters
sub delId
{
my ($self, $characters) = @_;
my $self = shift;
my $key = shift;
my $value = shift;
if ($self->{inValue} || $self->{inInfo} || $self->{inComment} || $self->{inWho}) {
$self->{values} .= $characters->{Data};
}
}
sub end_element
{
my ($self, $element) = @_;
if ($element->{Name} eq "value")
foreach my $group (@{ $self->{groups} })
{
if ($self->{values} =~ /(-?[0-9]+(.[0-9]+)?)/)
if ($group->{id} eq $key)
{
$self->{parsed}{ids}{ $self->{inEval} } += $1;
if ($self->{inValue} ne NO_ID_VALUE and $1) {
$self->{parsed}{ids}{ $self->{inValue} } = $1;
if (!$value || $value == $group->getValue())
{
$self->{groups} = \{ grep { $_->{id} ne $key } @{ $self->{groups} } };
}
last;
}
$self->{inValue} = "";
$group->delId($key, $value);
}
elsif ($element->{Name} eq "eval")
}
sub getIds
{
my $self = shift;
my $login = shift;
my %ids;
foreach my $group (@{ $self->{groups} })
{
#delete $self->{parsed}{ids}{ $self->{inEval} } if (!$self->{parsed}{ids}{ $self->{inEval} });
$self->{inEval} = "";
}
elsif ($element->{Name} eq "comment")
{
if ($self->{values} =~ /([^\s].*[^\s]|[^\s])/) {
$self->{parsed}{comments}{ $self->{inComment} } = $1;
my %tmp = $group->getIds($login);
while (my ($key, $value) = each %tmp)
{
$ids{$key} = $value;
}
$self->{inComment} = "";
}
elsif ($element->{Name} eq "who")
$ids{ $self->{id} } = $self->getValue($self->{id}, $login);
return %ids;
}
sub getValue
{
my $self = shift;
my $id = shift // $self->{id};
my $login = shift;
if ($id eq $self->{id})
{
if ($self->{values} =~ /([^\s].*[^\s]|[^\s])/) {
$self->{parsed}{who}{ $self->{inWho} } = $1;
my $value = 0;
foreach my $group (@{ $self->{groups} })
{
$value += $group->getValue(undef, $login);
}
$self->{inComment} = "";
return $value;
}
elsif ($element->{Name} eq "info")
else
{
if ($self->{values} =~ /([^\s].*[^\s]|[^\s])/) {
$self->{parsed}{infos}{ $self->{inInfo} } = $1;
my $value = 0;
foreach my $group (@{ $self->{groups} })
{
$value += $group->getValue($id, $login);
}
$self->{inInfo} = "";
return $value;
}
}
sub getWhos
{
my $self = shift;
my $ret = {};
foreach my $group (@{ $self->{groups} })
{
my $whos = $group->getWhos();
foreach my $who (keys %{ $whos }) {
$ret->{ $who } = $whos->{$who};
}
}
return $ret;
}
sub toString($$)
{
my $self = shift;
my $doc = shift;
my $gr = $doc->createElement("group");
foreach my $item (@{ $self->{groups} })
{
$gr->appendChild( $item->toString() );
}
return $gr;
}
package Trace::Eval;
use v5.10.1;
use strict;
use warnings;
use Carp;
use ACU::Log;
sub new ($$;$)
{
my $class = shift;
my $self = {
id => shift // "",
type => shift // "test",
values => {},
logs => {},
};
bless $self, $class;
if ($#_ >= 0) {
$self->parseEval(@_);
}
return $self;
}
sub parseEval
{
my $self = shift;
my $tree = shift;
foreach my $node ($tree->childNodes())
{
my $val = $node->textContent;
chomp($val);
if ($node->nodeName eq "value")
{
$self->addValue($node->getAttribute("id"),
$val);
}
elsif ($node->nodeName eq "name")
{
$self->{name} = $val;
}
elsif ($node->nodeName eq "status")
{
$self->{status} = $val;
}
elsif ($node->nodeName eq "log")
{
my $key = $node->getAttribute("type") // "stdout";
$self->{logs}{ $key } = $val;
}
elsif ($node->nodeName eq "who")
{
$self->{who} = {
login => $val,
type => $node->getAttribute("type") // "login"
};
}
}
}
sub delId
{
# Do nothing here, just an abstract method
}
sub changeWho
{
my $self = shift;
$self->{who} = {
login => shift,
type => shift // "login"
};
}
sub getIds
{
my $self = shift;
my $login = shift;
my %ids;
if (!$login || !exists $self->{who} || $self->{who}{type} eq "group" || $self->{who}{login} eq $login)
{
while (my ($key, $value) = each %{ $self->{values} })
{
$ids{$key} = $value if ($key);
}
$ids{ $self->{id} } = $self->getValue($self->{id}, $login);
}
return %ids;
}
sub addValue
{
my $self = shift;
my $key = shift // "";
my $val = shift;
$self->{values}{ $key } = 0 if (!exists $self->{values}{ $key });
$self->{values}{ $key } += $val;
}
sub getValue
{
my $self = shift;
my $id = shift // $self->{id};
my $login = shift;
my $value = 0;
if (!$login || !exists $self->{who} || $self->{who}{type} eq "group" || $self->{who}{login} eq $login)
{
foreach my $key (keys %{ $self->{values} })
{
$value += $self->{values}{$key} if ($id eq $self->{id} || !$key || $key eq $id);
}
}
return $value;
}
sub getWhos
{
my $self = shift;
return { $self->{id} => $self->{who} };
}
sub toString($$)
{
my $self = shift;
my $doc = shift;
my $e = $doc->createElement("eval");
$e->setAttribute("id", $self->{id});
$e->setAttribute("type", $self->{type});
if (defined $self->{who})
{
my $w = $doc->createElement("who");
$w->setAttribute("type", $self->{who}{type}) if (defined $self->{who}{type});
$w->appendTextNode( $self->{who}{login} );
$e->appendChild( $w );
}
for my $k (keys %{ $self->{values} })
{
my $v = $doc->createElement("value");
$v->setAttribute("id", $k) if ($k);
$v->appendTextNode( $self->{values}{$k} );
$e->appendChild( $v );
}
return $e;
}
1;

308
ACU/VCS/Git.pm Normal file
View file

@ -0,0 +1,308 @@
#! /usr/bin/env perl
package Git;
use v5.10.1;
use strict;
use warnings;
use File::Path qw(remove_tree);
use File::Temp;
use ACU::LDAP;
use ACU::Log;
use ACU::API::Projects;
our $git_user = "git";
our $git_server;
our $git_adminrepo = "gitolite-admin.git";
our $configuration_directory = "/conf/";
our $configuration_file = "subjects.conf";
our $projects_directory = "subjects/";
my $gitolite_directory;
# General part
sub init_conf(;$)
{
$git_server = $_ if (shift);
$gitolite_directory = mktemp("/tmp/git_manage_XXXX");
log INFO, "Cloning $git_user\@$git_server:$git_adminrepo to $gitolite_directory";
qx(git clone $git_user\@$git_server:$git_adminrepo $gitolite_directory);
chdir($gitolite_directory);
return $gitolite_directory;
}
sub save_conf(;$)
{
chdir($gitolite_directory);
my $commit = shift;
qx(git commit -am '$commit') if ($commit);
log INFO, "Saving repositories configuration";
qx(git push);
chdir("/");
remove_tree($gitolite_directory);
$gitolite_directory = undef;
}
# Auth part: give to user right on repository
sub auth_add
{
my $rgroup = shift;
my $rname = shift;
my $accesss = shift;
init_conf() if (!$gitolite_directory);
say " repo $rname";
for my $access (@{ $accesss })
{
say $access->gen_string("gitolite");
#say " RW+ = \@admins \@$year-$project_name-$login";
#say " RW+ = \@chefs \@resp-$year-$project_name";
}
}
sub auth_update
{
init_conf() if (!$gitolite_directory);
}
sub auth_delete
{
init_conf() if (!$gitolite_directory);
}
sub auth_save
{
init_conf() if (!$gitolite_directory);
}
# Repository part: manage repositories
# Gitolite manage repositories only if there are associated with rights
sub repository_add
{
}
sub repository_update
{
}
sub repository_delete
{
}
sub repository_group_add
{
my $g_name = shift; #group_name
my $g_comp = shift; # complement, here respo rights
my $skip_save = shift // 0;
if ($g_name !~ /^[a-zA-Z-_.]+$/) {
log ERROR, "Group name ($g_name) does not respect expected format ; skip add.";
return 0;
}
init_conf() if (!$gitolite_directory);
if (-f $gitolite_directory.$configuration_directory.$projects_directory."/".$g_name.".conf") {
log ERROR, "Cannot add new repository group: $g_name already exists!";
return 0;
}
else {
open my $g_conf, ">", $gitolite_directory.$configuration_directory.$projects_directory."/".$g_name.".conf";
say $g_conf $g_conf;
close $g_conf;
open $g_conf, ">>", $gitolite_directory.$configuration_directory.$configuration_file;
say $g_conf "include \"$projects_directory/$g_name.conf\"";
close $g_conf;
}
save_conf("Add repositories group $g_name") unless($skip_save);
return 1;
}
sub repository_group_delete
{
my $g_name = shift; #group_name
my $skip_save = shift // 0;
if ($g_name !~ /^[a-zA-Z-_.]+$/) {
log ERROR, "Group name ($g_name) does not respect expected format ; skip add.";
return 0;
}
init_conf() if (!$gitolite_directory);
my $configuration_path = $gitolite_directory.$configuration_directory.$configuration_file;
if (-f $gitolite_directory.$configuration_directory.$projects_directory."/".$g_name.".conf") {
open my $g_conf, "<", $configuration_path;
my @contents = <$g_conf>;
close $g_conf;
@contents = grep !/^include "\Q$projects_directory\/$g_name.conf\E"$/, @contents; #";
open $g_conf, '>', $configuration_path or die $!;
print $g_conf @contents;
close $g_conf;
unlink($gitolite_directory.$configuration_directory.$projects_directory."/".$g_name.".conf");
}
else {
log WARN, "Repository group $g_name not found.";
return 0;
}
save_conf("Delete repositories group $g_name") unless($skip_save);
return 1;
}
sub repository_group_update
{
my $g_name = shift;
repository_group_delete($g_name, 1);
if (!repository_group_add($g_name, shift, 1)) {
log ERROR, "Unable to readd $g_name group repository. Configuration not saved.";
return 0;
}
# ...;
auth_add();
save_conf("Delete repositories group $g_name") unless(shift);
}
# User part: manage user authentication (password, keys, ...)
sub user_add
{
my $login = shift;
my $skip_save = shift // 0;
my $multiple = shift // 0;
if (!$login or $login !~ /^(\*|[a-zA-Z0-9._-]+)$/) {
log WARN, "Login required in user_add";
return 0;
}
init_conf() if (!$gitolite_directory);
# First, remove all user keys
user_delete($login, 1, $multiple);
# Then, extract user keys
my @entries = LDAP::search_dns(undef, "ou=users", "&(uid=$login)(sshPublicKey=*)", "uid", "sshPublicKey");
if ($#entries > 1 && !$multiple) { log WARN, "Found multiple user $login, aborting keys update."; return 0; }
for my $entry (@entries)
{
my $login = $entry->get_value("uid");
if ($login)
{
my $i = 0;
my @keys = $entry->get_value("sshPublicKey");
log INFO, "Updating ".($#keys+1)." keys for $login.";
for my $key (@keys)
{
chomp $key;
mkdir $gitolite_directory."/keydir/$i" unless (-d $gitolite_directory."/keydir/$i");
open my $kf, ">", $gitolite_directory."/keydir/$i/$login.pub";
print $kf $key;
close $kf;
qx(git add $gitolite_directory/keydir/$i/$login.pub);
$i += 1;
}
}
}
if ($multiple) {
save_conf("Update users keys from LDAP") unless ($skip_save);
}
else {
save_conf("Update $login keys from LDAP") unless ($skip_save);
}
return 1;
}
sub user_delete
{
my $login = shift;
my $skip_save = shift // 0;
my $multiple = shift // 0;
if (!$login) {
log WARN, "Login required in user_add";
return 0;
}
init_conf() if (!$gitolite_directory);
opendir(my $dh, "$gitolite_directory/keydir/") || die "can't opendir keydir: $!";
for my $f (readdir $dh)
{
if($multiple)
{
if ($f =~ /^[0-9]/ && -d "$gitolite_directory/keydir/$f") {
log INFO, "Removing $f directory";
remove_tree("$gitolite_directory/keydir/$f");
}
}
else
{
if (-f "$gitolite_directory/keydir/$f/$login.pub") {
log INFO, "Removing $f/$login.pub";
unlink("$gitolite_directory/keydir/$f/$login.pub");
}
}
}
closedir $dh;
save_conf("Remove $login keys") unless ($skip_save);
return 1;
}
sub user_update
{
return user_add(@_);
}
sub users_update
{
return user_add("*", (shift // 0), 1);
}
sub users_del
{
return user_del("*", (shift // 0), 1);
}
1;

View file

@ -1,21 +1,60 @@
COPY=cp -v
DEST=/usr/local/share/perl/`ls -1 /usr/lib/perl/ | tail -1`/
GITOLITE_DEST=/usr/share/gitolite/hooks/common
MAKEDIR=mkdir
PROVER=prove -f
RM=rm
TESTDIR=t
COPY?=cp -v
CURL?=curl
DEST?=/usr/local/share/perl/`ls -1 /usr/local/share/perl/ | grep "^5." | tail -1`/
GIT?=/usr/bin/git
GITOLITE_DEST?=/usr/share/gitolite/hooks/common
MAKEDIR?=mkdir
PERL?=/usr/bin/env perl
PROVER?=prove -f
RM?=rm
RMTREE?=rm -r
TESTDIR?=t
SHELL?=/bin/sh
launch:
$(SHELL) ./process/launch.sh
install:
$(SHELL) commands/first-install.sh
$(MAKEDIR) -p $(DEST)
$(COPY) -r ACU/ $(DEST)
test -d $(GITOLITE_DEST) && $(MAKEDIR) -p $(GITOLITE_DEST)/update.secondary.d
test -d $(GITOLITE_DEST) && $(COPY) hooks/* $(GITOLITE_DEST)/update.secondary.d/
! test -d $(GITOLITE_DEST) || $(MAKEDIR) -p $(GITOLITE_DEST)/update.secondary.d
! test -d $(GITOLITE_DEST) || $(COPY) hooks/gl-pre-git $(GITOLITE_DEST)/
! test -d $(GITOLITE_DEST) || $(COPY) hooks/post-update $(GITOLITE_DEST)/
! test -d $(GITOLITE_DEST) || $(COPY) hooks/subjects.pl $(GITOLITE_DEST)/update.secondary.d/
! test -d $(GITOLITE_DEST) || $(COPY) hooks/conferences.pl $(GITOLITE_DEST)/update.secondary.d/
! test -d $(GITOLITE_DEST) || $(COPY) hooks/submissions.pl $(GITOLITE_DEST)/update.secondary.d/
guantanamo.tar.gz:
$(MAKEDIR) -p guantanamo/ACU
$(COPY) process/exec/guantanamo_node.pl guantanamo/
$(COPY) ACU/Log.pm ACU/Process.pm process/exec/guantanamo_node.pl guantanamo/ACU/
$(COPY) process/exec/run.sh.not-here guantanamo/run.sh
chmod +x guantanamo/run.sh
tar czf guantanamo.tar.gz guantanamo/
$(RMTREE) guantanamo
update:
$(GIT) pull
$(SHELL) commands/first-install.sh
upgrade: install
unstall:
$(RM) -r $(DEST)/ACU/
test -d $(GITOLITE_DEST) && $(RM) -rf $(GITOLITE_DEST)/update.secondary.d
test -d $(GITOLITE_DEST) && $(MAKEDIR) -p $(GITOLITE_DEST)/update.secondary.d
! test -d $(GITOLITE_DEST) || $(RM) -rf $(GITOLITE_DEST)/gl-pre-git
! test -d $(GITOLITE_DEST) || $(RM) -rf $(GITOLITE_DEST)/update.secondary.d
! test -d $(GITOLITE_DEST) || $(MAKEDIR) -p $(GITOLITE_DEST)/update.secondary.d
regen-objects:
$(MAKEDIR) -p ACU/dtd
$(CURL) -o ACU/dtd/defense.dtd http://acu.epita.fr/dtd/defense.dtd
$(CURL) -o ACU/dtd/grading.dtd http://acu.epita.fr/dtd/grading.dtd
$(CURL) -o ACU/dtd/groups.dtd http://acu.epita.fr/dtd/groups.dtd
$(CURL) -o ACU/dtd/project.dtd http://acu.epita.fr/dtd/project.dtd
$(CURL) -o ACU/dtd/traces.dtd http://acu.epita.fr/dtd/traces.dtd
$(PERL) -I baldr baldr/Baldr.pl --import="ACU/Objects/basecode/*.pm" --path=ACU/Objects ACU/dtd/defense.dtd ACU/dtd/grading.dtd ACU/dtd/groups.dtd ACU/dtd/project.dtd ACU/dtd/traces.dtd
$(RMTREE) ACU/dtd
test:
$(PROVER) $(TESTDIR)

View file

@ -0,0 +1,93 @@
#! /usr/bin/env perl
use v5.10.1;
use strict;
use warnings;
use Getopt::Long;
use Pod::Usage;
use XML::LibXML;
use lib "../";
use ACU::Defense;
# Parse arguments
my $input; my $output;
my $help; my $man;
GetOptions ("output|O=s" => \$output,
"help|h|?" => \$help,
"man" => \$man,
"" => \$input)
or pod2usage(2);
pod2usage(1) if $help;
pod2usage(-exitval => 0, -verbose => 2) if $man;
# Open defense XML file
my $xmlin;
if (defined $input || $#ARGV == -1) {
$xmlin = *STDIN;
}
else {
open $xmlin, "<", $ARGV[0] or die $!;
}
binmode $xmlin;
my $str;
$str .= $_ while(<$xmlin>);
my $defense = Defense->new($str);
close $xmlin unless $xmlin eq *STDIN;
$defense->genIds;
# Save defense XML file
my $xmlout;
if (defined $output) {
open $xmlout, '>', $output;
binmode $xmlout;
}
else {
$xmlout = *STDOUT;
}
print {$xmlout} $defense->toString();
close $xmlout unless $xmlout eq *STDOUT;
__END__
=head1 NAME
prepare_xml.pl - Prepare defense XML by adding id to groups, questions and answers
=head1 SYNOPSIS
prepare_xml.pl [options] [file]
=head1 DESCRIPTION
Parse the XML file given (or stdin if no file is given) and add id to groups, questions and answers that have any or duplicate id.
Options:
-output=file.xml save prepared XML to this location
-help brief help message
-man full documentation
=head1 OPTIONS
=over 8
=item B<-output=file.xml>
Save the prepared XML to a file instead of printing it on standard output.
=item B<-help>
Print a brief help message and exits.
=item B<-man>
Prints the manual page and exits.
=back
=cut

115
commands/first-install.sh Executable file
View file

@ -0,0 +1,115 @@
#! /bin/bash
# Install missing packages
DEB_PACKAGES_LIST="screen libnet-ldap-perl libxml-libxml-perl libgearman-client-perl libmailtools-perl libdatetime-format-iso8601-perl libnet-ip-perl libsys-gamin-perl libdigest-sha-perl libemail-mime-perl libemail-sender-perl libtext-glob-perl"
ARCH_PACKAGES_LIST="screen perl-io-socket-ssl perl-email-mime perl-term-readkey perl-ldap perl-lwp-protocol-https perl-datetime-format-iso8601 perl-net-ip" # aur/perl-sys-gamin aur/perl-text-glob
GENTOO_PACKAGES_LIST="app-misc/screen dev-perl/XML-LibXML dev-perl/IO-Socket-SSL dev-perl/Email-MIME dev-perl/TermReadKey dev-perl/perl-ldap dev-perl/LWP-Protocol-https dev-perl/DateTime-Format-ISO8601 dev-perl/Net-IP dev-perl/Email-Sender dev-perl/Text-Glob"
FBSD_PACKAGES_LIST="screen p5-XML-LibXML p5-Gearman p5-IO-Socket-SSL p5-Email-MIME p5-Term-ANSIColor p5-Term-ReadKey p5-LWP-Protocol-https p5-DateTime-Format-ISO8601 p5-Net-IP p5-Sys-Gamin p5-Text-Glob"
KERNEL=`uname -s`
if [ "$KERNEL" = "FreeBSD" ]
then
for PK in `echo $FBSD_PACKAGES_LIST`
do
if ! pkg info "$PK" > /dev/null 2> /dev/null
then
if ! PACKAGESITE="http://canon.acu.epita.fr/repo-lab" pkg install "$PK"
then
echo "Error during installation of $PK"
exit 1
fi
fi
done
if ! getent passwd | grep "intradmin:" > /dev/null 2> /dev/null
then
pw useradd intradmin -u 942 -d /data -s /bin/false
fi
elif [ "$KERNEL" = "Linux" ]
then
if [ -f "/etc/debian_version" ]
then
if ! whereis dpkg > /dev/null 2> /dev/null
then
if ! aptitude install dpkg
then
echo "Error during installation of $PK"
exit 1
fi
fi
for PK in $DEB_PACKAGES_LIST
do
if ! dpkg -l | grep "^ii" | grep "$PK" > /dev/null 2> /dev/null
then
aptitude install "$PK"
fi
done
# Add intradmin user if missing
if ! getent passwd | grep "intradmin:" > /dev/null 2> /dev/null
then
useradd --shell /bin/false --uid 942 intradmin &&
mkdir -p /home/intradmin
fi
chown -R intradmin:intradmin /home/intradmin
elif [ -f "/etc/arch-release" ]
then
for PK in $ARCH_PACKAGES_LIST
do
if ! pacman -Qi "$PK" > /dev/null 2> /dev/null
then
if ! pacman -S "$PK"
then
echo "Error during installation of $PK"
exit 1
fi
fi
done
elif [ -f "/etc/gentoo-release" ]
then
for PK in $GENTOO_PACKAGES_LIST
do
if ! equery list "$PK" > /dev/null 2> /dev/null
then
if ! emerge "$PK"
then
echo "Error during installation of $PK"
exit 1
fi
fi
done
else
echo "Unsupported GNU/Linux distribution :("
exit 1;
fi
else
echo "Unsupported operating system :("
exit 1;
fi
# Git ?
if egrep '^git:' /etc/passwd > /dev/null
then
mkdir -p /var/log/hooks/ &&
chown git /var/log/hooks/
fi
echo "System ready!"

14
commands/gen_pass.pl Normal file
View file

@ -0,0 +1,14 @@
#! /usr/bin/env perl
use v5.10.1;
use strict;
use warnings;
use Pod::Usage;
BEGIN {
push @INC, "../";
}
use ACU::Password;
say Password::gen_password($ARGV[0], $ARGV[1]);

View file

@ -0,0 +1,50 @@
#! /usr/bin/env perl
use v5.10.1;
use strict;
use warnings;
use File::Basename;
use lib "../../";
use ACU::LDAP;
use ACU::Log;
use ACU::Process;
if ($#ARGV >= 1)
{
my $project_id = shift;
my $year = shift;
if ($year !~ /^[0-9]{4}$/)
{
unshift @_, $year;
$year = LDAP::get_year();
}
my %files;
for my $f (@_)
{
open my $input, "<", $f or die("$f: $@");
my $cnt;
$cnt .= $_ while (<$input>);
close $input unless $input eq *STDIN;
$files{ basename($f, ".txt", ".lst", ".list", ".xml") } = $cnt;
}
if (my $err = Process::Client::launch("intradata_get", { action => "new_bonus", type => "grades", id => $project_id, "year" => $year }, \%files))
{
if (${ $err } ne "Ok") {
log ERROR, "Erreur durant le processus de publication : " . ${ $err };
}
}
}
else
{
say "$0 [-d] <project_id> [project_year] <file> [files ...]";
say "\t-d: delete bonus for listed logins (matching value if given)"
}

14
commands/guantanamo_list.sh Executable file
View file

@ -0,0 +1,14 @@
#!/bin/sh
if ! which gearman > /dev/null 2> /dev/null
then
echo "gearman isn't installed on this machine. Please try another one."
exit 1
fi
cat <<EOF | gearman -h gearmand -p 4730 -f guantanamo
<?xml version="1.0" encoding="UTF-8"?>
<process>
<param name="action">list</param>
</process>
EOF

View file

@ -10,22 +10,22 @@ use lib "../../";
use ACU::Log;
use ACU::LDAP;
sub get_students()
sub get_students
{
my $ldap = LDAP::ldap_connect();
my $year = LDAP::get_year($ldap);
my $year = shift // LDAP::get_year($ldap);
return LDAP::search_dns($ldap, "ou=$year,ou=users", "objectClass=epitaAccount", "cn", "uid", "uidNumber");
}
if ($#ARGV == -1) {
log(USAGE, "$0 format");
say "format can be csv"
say "format can be csv or login"
}
elsif ($ARGV[0] eq "csv")
{
for my $student (get_students)
for my $student (get_students $ARGV[1])
{
print $student->get_value("cn");
print ",";
@ -35,3 +35,9 @@ elsif ($ARGV[0] eq "csv")
say ",Present";
}
}
elsif ($ARGV[0] eq "login")
{
for my $student (get_students $ARGV[1]) {
say $student->get_value("uid");
}
}

133
commands/manage-server.sh Executable file
View file

@ -0,0 +1,133 @@
#! /usr/bin/env bash
cd $(dirname "$0")
WKS_LIST="apl"
SRV_LIST="moore noyce hamano cpp otto"
SCP_LIST="ksh knuth"
KNOWN_ACTIONS="start stop restart install update log viewlog view_log"
LOG=`mktemp`
ACTIONS=
DESTS=
USED=1
while [ $# -gt 0 ] && [ $USED -eq 1 ]
do
USED=0
for ACT in $KNOWN_ACTIONS
do
if [ -n "$1" ] && [ "$1" == "$ACT" ]
then
ACTIONS="$ACTIONS $ACT"
USED=1
break
fi
done
for DEST in $WKS_LIST $SRV_LIST $SCP_LIST
do
if [ -n "$1" ] && [ "$1" == "$DEST" ]
then
DESTS="$DESTS $DEST"
USED=1
break
fi
done
if [ "$1" == "@srv" ]
then
DESTS="$DESTS $SRV_LIST"
USED=1
elif [ "$1" == "@wks" ]
then
DESTS="$DESTS $WKS_LIST"
USED=1
fi
if [ $USED -eq 1 ]
then
shift
fi
done
if [ -z "$ACTIONS" ]
then
echo "Usage: $0 [where] <`echo $KNOWN_ACTIONS | sed 's/ /|/g'`> [options]"
exit 1
fi
if [ -z "$DESTS" ]
then
DESTS="$SRV_LIST $WKS_LIST $SCP_LIST"
fi
OPTIONS=
while [ $# -gt 0 ]
do
OPTIONS="$OPTIONS $1"
shift
done
FAIL=0
for ACTION in $ACTIONS
do
for DEST in $DESTS
do
echo -e "\e[1;34m>>>\e[0m \e[33m$ACTION\e[0m on \e[1m$DEST\e[0m"
if [ "$ACTION" == "install" ] || [ "$ACTION" == "update" ]
then
SCP=0
for D in $SCP_LIST
do
if [ $D == $DEST ]
then
SCP=1
break
fi
done
if [ $SCP -eq 0 ]
then
if [ "$ACTION" == "install" ] &&
! ssh root@$DEST "mkdir -p /home/intradmin/ && git clone '$(echo `git remote -v` | cut -d " " -f 2)' /home/intradmin/liblerdorf && ln -s /home/intradmin/liblerdorf ~/liblerdorf"
then
exit 1
fi
ssh root@$DEST "make -C liblerdorf update upgrade"
else
cd ..
git archive -o ./liblerdorf.tbz2 master
scp ./liblerdorf.tbz2 root@$DEST:
cd -
ssh root@$DEST rm -rf liblerdorf
ssh root@$DEST mkdir -p liblerdorf
ssh root@$DEST tar xf ./liblerdorf.tbz2 -C liblerdorf
ssh root@$DEST "DEST=/usr/local/lib/perl5/5.14/ACU make -C liblerdorf upgrade"
fi
elif [ "$ACTION" == "log" ] || [ "$ACTION" == "viewlog" ] || [ "$ACTION" == "view_log" ]
then
ssh root@$DEST '~'/liblerdorf/process/view_log.sh $OPTIONS
else
ssh root@$DEST '~'/liblerdorf/process/launch.sh "$ACTION"
fi
if [ $? -eq 0 ]
then
echo -e "\e[1;32m>>>\e[0m \e[33m$ACTION\e[0m success on \e[1m$DEST\e[0m" | tee -a "$LOG"
else
echo -e "\e[1;31m>>>\e[0m \e[33m$ACTION\e[0m fails on \e[1m$DEST\e[0m" | tee -a "$LOG"
FAIL=1
fi
echo
done
done
cat "$LOG"
exit $FAIL

45
commands/moulette/launch.sh Executable file
View file

@ -0,0 +1,45 @@
#!/bin/sh
if [ -z "$2" ]
then
echo "Usage: $0 [year] <project> <submission> [login ...]"
exit 1
fi
if ! which gearman > /dev/null 2> /dev/null
then
echo "gearman isn't installed on this machine. Please try another one."
exit 1
fi
if [ "x${1:0:2}" = "x20" ]
then
YEAR="$1"
shift
else
YEAR=`ldapsearch -x -b "cn=year,dc=acu,dc=epita,dc=fr" | grep "^year" | cut -d " " -f 2`
fi
PROJECT_ID=$1
RENDU=$2
shift 2
LOGINS=
while [ $# -gt 0 ]
do
LOGINS="$LOGINS <param>$1</param>
"
shift
done
cat <<EOF | gearman -h gearmand-srv -p 4730 -f moulette_get
<?xml version="1.0" encoding="UTF-8"?>
<process>
<param name="type">moulette</param>
<param name="year">$YEAR</param>
<param name="id">$PROJECT_ID</param>
<param name="rendu">$RENDU</param>
$LOGINS</process>
EOF
echo

View file

@ -0,0 +1,83 @@
#!/bin/bash
usage()
{
echo "Usage: $0 [-d] [year] <project> <submission> <login> <tarball>"
}
if [ -z "$4" ]
then
usage
exit 1
fi
if ! which gearman > /dev/null 2> /dev/null
then
echo "gearman isn't installed on this machine. Please try another one."
exit 1
fi
if [ "x$1" = "x-d" ]
then
BACKGROUD=
shift
else
BACKGROUD="-b"
fi
if [ "x${1:0:2}" = "x20" ]
then
YEAR=" <param name=\"year\">$1</param>"
shift
else
YEAR=
fi
PROJECT_ID=$1
RENDU=$2
LOGIN=$3
if ! [ -f "$4" ]
then
usage
exit 2
fi
MIME=`file -b -i "$4" | cut -d ';' -f 1`
if [ "$MIME" = "application/x-bzip2" ]
then
FILE=`bzip2 --decompress --stdout "$4" | gzip --stdout | base64`
elif [ "$MIME" = "application/x-gzip" ]
then
FILE=`gzip --decompress --stdout "$4" | gzip --stdout | base64`
elif [ "$MIME" = "application/x-xz" ]
then
FILE=`xz --decompress --stdout "$4" | gzip --stdout | base64`
elif [ "$MIME" = "application/x-tar" ]
then
FILE=`tar cz "$4" | base64`
elif [ "$MIME" = "inode/directory" ]
then
FILE=`tar xf "$4" | tar cz | base64`
else
echo "I don't know how to treat $4" >&2
exit 3
fi
cat <<EOF | gearman -h gearmand-srv -p 4730 -f moulette_get $BACKGROUD
<?xml version="1.0"?>
<process>
<param name="type">std</param>
$YEAR
<param name="id">$PROJECT_ID</param>
<param name="rendu">$RENDU</param>
<param name="login">$LOGIN</param>
<param name="file">rendu.tgz</param>
<file name="rendu.tgz">$FILE</file>
</process>
EOF

59
commands/moulette/sendgit.sh Executable file
View file

@ -0,0 +1,59 @@
#!/bin/sh
usage()
{
echo "Usage: $0 [-d] [year] <project> <submission> <login> [login ...]"
}
if [ -z "$3" ]
then
usage
exit 1
fi
if ! which gearman > /dev/null 2> /dev/null
then
echo "gearman isn't installed on this machine. Please try another one."
exit 1
fi
if [ "x$1" = "x-d" ]
then
BACKGROUD=
shift
else
BACKGROUD="-b"
fi
if [ "x${1:0:2}" = "x20" ]
then
YEAR=" <param name=\"year\">$1</param>"
shift
else
YEAR=
fi
PROJECT_ID=$1
RENDU=$2
shift 2
if [ $# -le 0 ]
then
usage
exit 1
fi
while [ $# -gt 0 ]
do
LOGIN=$1
cat <<EOF | gearman -h gearmand -p 4730 -f send_git $BACKGROUD
<?xml version="1.0"?>
<process>
$YEAR
<param name="id">$PROJECT_ID</param>
<param name="rendu">$RENDU</param>
<param name="login">$LOGIN</param>
</process>
EOF
shift
done

View file

@ -0,0 +1,23 @@
#!/bin/sh
if [ -z "$1" ]
then
echo "Usage: $0 <memory>"
exit 1
fi
if ! which gearman > /dev/null 2> /dev/null
then
echo "gearman isn't installed on this machine. Please try another one."
exit 1
fi
cat <<EOF | gearman -h gearmand-srv -p 4730 -f moulette_get
<?xml version="1.0" encoding="UTF-8"?>
<process>
<param name="type">set_memory</param>
<param name="to">$1</param>
</process>
EOF
echo

View file

@ -0,0 +1,23 @@
#!/bin/sh
if [ -z "$1" ]
then
echo "Usage: $0 <nb_worker>"
exit 1
fi
if ! which gearman > /dev/null 2> /dev/null
then
echo "gearman isn't installed on this machine. Please try another one."
exit 1
fi
cat <<EOF | gearman -h gearmand-srv -p 4730 -f moulette_get
<?xml version="1.0" encoding="UTF-8"?>
<process>
<param name="type">set_workers</param>
<param name="to">$1</param>
</process>
EOF
echo

29
commands/moulette/stats.sh Executable file
View file

@ -0,0 +1,29 @@
#!/bin/sh
if ! which gearman > /dev/null 2> /dev/null
then
echo "gearman isn't installed on this machine. Please try another one."
exit 1
fi
ACTION=
if [ -n "$1" ]
then
if [ "$1" = "flush" ]
then
ACTION=" <param name=\"action\">flush</param>
"
else
echo "Unknown action '$1'"
exit 1
fi
fi
cat <<EOF | gearman -h gearmand-srv -p 4730 -f moulette_get
<?xml version="1.0" encoding="UTF-8"?>
<process>
<param name="type">stats</param>
$ACTION</process>
EOF
echo

View file

@ -4,15 +4,13 @@ use v5.10.1;
use strict;
use warnings;
use lib "../../";
use ACU::API::Base;
use ACU::API::Projects;
if ($#ARGV == 0)
{
API::Projects::add($ARGV[0]);
API::Projects::add($ARGV[0], "");
}
else
{

View file

@ -0,0 +1,40 @@
#!/usr/bin/env perl
use strict;
use warnings;
use v5.10;
use Data::Dumper;
use ACU::API::Projects;
my $projid = $ARGV[0];
my $year = $ARGV[1] // LDAP::get_year;
my $res = API::Projects::get_groups($projid, $year);
map {
my $chief;
# First, found the chief
for my $member (@{ $_->{stds} })
{
if ($member->{chief} eq "true" or $member->{chief} eq "1" or $member->{chief} eq "chief")
{
$chief = $member;
last;
}
}
my @members;
for my $member (@{ $_->{stds} }) {
push @members, $member->{login};
}
say "repo $year/$projid/$chief->{login}";
say " - ACU-moulette = ", join(" ", @members);
say " - refs/tags/ACU- = ", join(" ", @members);
say ' RW+ = @admins ', join(" ", @members);
say ' RW ACU-moulette = @moulettes';
say ' RW+ refs/tags/ACU- = @moulettes';
say " R = \@chefs \@resp-$year-$projid \@soutenance-$year-$projid \@moulettes intradmin-hamano";
} @{ $res->{groups} };

View file

@ -10,11 +10,11 @@ use ACU::API::Base;
use ACU::API::Projects;
if ($#ARGV == 0)
if ($#ARGV == 0 or $#ARGV == 1)
{
API::Projects::gen_groups($ARGV[0]);
API::Projects::gen_groups($ARGV[0], $ARGV[1]);
}
else
{
say "$0 <project_id>";
say "$0 <project_id> [year]";
}

View file

@ -0,0 +1,20 @@
#! /usr/bin/env perl
use v5.10.1;
use strict;
use warnings;
use lib "../../";
use ACU::API::Base;
use ACU::API::Projects;
if ($#ARGV == 1)
{
API::Projects::add_traces($ARGV[0], $ARGV[1]);
}
else
{
say "$0 <project_id> <traces_id>";
}

View file

@ -0,0 +1,39 @@
#!/bin/sh
if [ "$#" -ne 3 ]
then
echo "Usage: $0 project rendu git_repo"
exit 1
fi
project_id="$1"
rendu="$2"
git_repo="$3"
if ! whereis gearman > /dev/null 2> /dev/null
then
echo "gearman isn't installed on this machine. Please try another one."
exit 1
fi
if [ ! -d "$git_repo" ]; then
ls "$git_repo"
echo "$git_repo: file not found"
exit 2
fi
FILENAME=$(basename "$git_repo")
FILE="<file name=\"$FILENAME\">$(tar -czf - -C "$git_repo" . | base64 )</file>"
cat <<EOF | gearman -h gearmand -p 4730 -f moulette_get
<?xml version="1.0" encoding="UTF-8"?>
<process>
<param name="type">std</param>
<param name="id">$project_id</param>
<param name="year">2016</param>
<param name="rendu">$rendu</param>
<param name="login">$FILENAME</param>
<param name="file">$FILENAME</param>
$FILE
</process>
EOF

View file

@ -0,0 +1,50 @@
#!/bin/sh
if [ "$#" -ne 3 ]
then
echo "Usage: $0 project rendu [login] file"
exit 1
fi
project_id="$1"
rendu="$2"
if [ -z "$4" ]
then
login=`basename $3`
login="${login%%.xml}"
file="$3"
else
login="$3"
file="$4"
fi
if ! whereis gearman > /dev/null 2> /dev/null
then
echo "gearman isn't installed on this machine. Please try another one."
exit 1
fi
if ! [ -f "$file" ]; then
echo "$file: File not found"
exit 2
fi
if [ -z "$login" ]
then
FILENAME=$(basename "$file")
else
FILENAME="$login.xml"
fi
FILE="<file name=\"$FILENAME\">$(base64 $file)</file>"
cat <<EOF | gearman -h gearmand -p 4730 -f intradata_get
<?xml version="1.0" encoding="UTF-8"?>
<process>
<param name="type">trace</param>
<param name="id">$project_id</param>
<param name="year">2016</param>
<param name="rendu">$rendu</param>
<param name="login">$login</param>
$FILE
</process>
EOF

View file

@ -1,158 +0,0 @@
#! /usr/bin/env perl
use v5.10.1;
use strict;
use warnings;
use Getopt::Long;
use Pod::Usage;
use XML::LibXML;
# Extract IDs and remove duplicates
sub extract_ids (\@@)
{
my $ids = shift @_;
foreach my $node (@_)
{
my $att = $node->getAttribute("id");
if (defined $att)
{
if (grep {$_ eq $att} @$ids) {
$node->removeAttribute("id");
}
else {
push @$ids, $att;
}
}
}
}
# Parse arguments
my $input; my $output;
my $help; my $man;
GetOptions ("output|O=s" => \$output,
"help|h|?" => \$help,
"man" => \$man,
"" => \$input)
or pod2usage(2);
pod2usage(1) if $help;
pod2usage(-exitval => 0, -verbose => 2) if $man;
# Open defense XML file
my $xmlin;
if (defined $input || $#ARGV == -1) {
$xmlin = *STDIN;
}
else {
open $xmlin, "<", $ARGV[0] or die $!;
}
binmode $xmlin;
my $dom = XML::LibXML->load_xml(IO => $xmlin);
close $xmlin unless $xmlin eq *STDIN;
# First, get all existing ID and remove duplicates
my @ids;
extract_ids @ids, $dom->getElementsByTagName("group");
extract_ids @ids, $dom->getElementsByTagName("question");
extract_ids @ids, $dom->getElementsByTagName("answer");
# Then, attribute an ID to node that hasn't
my $grp_i = 0;
foreach my $group ($dom->getElementsByTagName("group"))
{
my $cur_gid = $group->getAttribute("id");
if (!defined $cur_gid) {
do {
$cur_gid = "defg".$grp_i;
$grp_i += 1;
} while (grep {$_ eq $cur_gid} @ids);
$group->setAttribute("id", $cur_gid);
}
else {
$grp_i += 1;
}
my $qst_i = 0;
foreach my $question ($group->getElementsByTagName("question"))
{
my $cur_qid = $question->getAttribute("id");
if (!defined $cur_qid) {
do {
$cur_qid = $cur_gid."q".$qst_i;
$qst_i += 1;
} while (grep {$_ eq $cur_qid} @ids);
$question->setAttribute("id", $cur_qid);
}
else {
$qst_i += 1;
}
my $ans_i = 0;
foreach my $answer ($question->getElementsByTagName("answer"))
{
my $cur_aid = $answer->getAttribute("id");
if (!defined $cur_aid) {
do {
$cur_aid = $cur_qid."a".$ans_i;
$ans_i += 1;
} while (grep {$_ eq $cur_aid} @ids);
$answer->setAttribute("id", $cur_aid);
}
else {
$ans_i += 1;
}
}
}
}
# Save defense XML file
my $xmlout;
if (defined $output) {
open $xmlout, '>', $output;
binmode $xmlout;
}
else {
$xmlout = *STDOUT;
}
print {$xmlout} $dom->toString();
close $xmlout unless $xmlout eq *STDOUT;
__END__
=head1 NAME
prepare_xml.pl - Prepare defense XML by adding id to groups, questions and answers
=head1 SYNOPSIS
prepare_xml.pl [options] [file]
=head1 DESCRIPTION
Parse the XML file given (or stdin if no file is given) and add id to groups, questions and answers that have any or duplicate id.
Options:
-output=file.xml save prepared XML to this location
-help brief help message
-man full documentation
=head1 OPTIONS
=over 8
=item B<-output=file.xml>
Save the prepared XML to a file instead of printing it on standard output.
=item B<-help>
Print a brief help message and exits.
=item B<-man>
Prints the manual page and exits.
=back
=cut

View file

@ -41,8 +41,11 @@ do {
open $xml, "<", $file or die $!;
binmode $xml;
my $str;
$str .= $_ while (<$xml>);
eval {
$trace = Defense->new($xml);
$trace = Defense->new($str);
};
if ($@) {
log ERROR, "Unknown file type: $file";
@ -51,8 +54,8 @@ do {
close $xml unless $xml eq *STDIN;
$grade->create_from_trace($id_name, $name, $trace);
$grade->create_from_ids($id_name, $name, $trace);
} while ($#ARGV >= 0);
print $grade->to_string();
print $grade->toString();

View file

@ -34,7 +34,9 @@ else {
open $xmlgrading, "<", shift or die $!;
}
binmode $xmlgrading;
my $grade = Grading->new($xmlgrading);
my $str;
$str .= $_ while(<$xmlgrading>);
my $grade = Grading->new($str);
close $xmlgrading unless $xmlgrading eq *STDIN;
my $who = "";

49
hooks/conferences.pl Normal file
View file

@ -0,0 +1,49 @@
#!/usr/bin/env perl
use strict;
use warnings;
use v5.10;
use Digest::SHA qw(sha1_base64);
use File::Basename;
use utf8;
use ACU::API::Projects;
use ACU::Defense;
use ACU::LDAP;
use ACU::Log;
$ACU::Log::log_file = "/var/log/hooks/" . basename($0) . ".log";
use ACU::Process;
# First, check if the repository is in the conferences/ directory
exit 0 if ($ENV{GL_REPO} !~ /^conferences\//);
my ($ref, $oldsha, $newsha) = @ARGV;
log DONE, "This is a conference repository!";
my %known_tags = (
"subject" => \&tag_document,
);
if ($ref =~ m<^refs/tags(/.+)$>)
{
my $tag = $1;
my @args;
while ($tag =~ m<[,/]([^,]*)>g) {
push @args, $1;
}
my $create = ($newsha ne '0' x 40);
if (exists $known_tags{$args[0]}) {
exit $known_tags{$args[0]}($create, @args);
}
}
exit 0;
sub tag_document
{
}

40
hooks/dump-help.pl Executable file
View file

@ -0,0 +1,40 @@
#!/usr/bin/env perl
use strict;
use warnings;
use v5.10;
use utf8;
use Carp;
use File::Basename;
use File::Path qw(remove_tree);
use File::Temp qw/tempfile tempdir/;
use ACU::Log;
$ACU::Log::log_file = "/var/log/hooks/" . basename($0) . ".log";
use ACU::Process;
# First, check if the repository is dump-help
exit 0 if ($ENV{GL_REPO} ne "dump-help");
my ($ref, $oldsha, $newsha) = @ARGV;
log DONE, "This is the dump-help repository!";
exit 0 if ($newsha eq '0' x 40);
if ($ref eq "refs/tags/release")
{
my $archive = qx(git archive --format=tgz $newsha);
#qx(git clone -b release /srv/git/repositories/dump-help.git '$tempdir') or croak "It is not a valid repository.";
Process::Client::launch("docs_compile",
{
"type" => "dump_help",
"file" => "dump-help.tgz" ,
},
{ "dump-help.tgz" => $archive });
}
exit 0;

84
hooks/gl-pre-git Executable file
View file

@ -0,0 +1,84 @@
#!/usr/bin/env perl
use strict;
use warnings;
use v5.10;
use File::Basename;
use Net::IP;
use utf8;
use ACU::Log;
$ACU::Log::log_file = "/var/log/hooks/" . basename($0) . ".log";
my $ip = $1 if ($ENV{'SSH_CLIENT'} =~ m/([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}).*/);
exit 0 if (!$ip);
log DEBUG, "Connection by $ENV{GL_USER} with $ARGV[0] to $ENV{GL_REPO} from $ip";
my $promo = qx(git config hooks.promo);
my $id_project = qx(git config hooks.idproject);
my $repo_login = qx(git config hooks.repologin);
my @apping3 = qw(saadi_n lucas_e jawhar_s france_b roux_m bamba_m boudje_s gillot_l le-pen_m gimene_a nguye_d marin_c piedno_j salmon_b);
my @habitent_loin = qw(amed_m bellev_m freima_m ikouna_l simon_j faure_n abdelm_a habri_z trang_d henrie_p verbec_y molini_v marti_o colin_j);
# First, check if the repository is in the YYYY/ directory
exit 0 if (($promo && $id_project && $repo_login) || $ENV{GL_REPO} !~ /^2[0-9]{3}\/.+\/.+/);
my ($ref, $oldsha, $newsha) = @ARGV;
$promo = $1 if (!$promo && $ENV{'GL_REPO'} =~ m/([0-9]{4}).*/);
$id_project = $1 if (!$id_project && $ENV{'GL_REPO'} =~ m/.*\/(.*)\//);
$repo_login = $1 if (!$repo_login && $ENV{'GL_REPO'} =~ m/.*\/.*\/(.*)/);
my $read = ($ARGV[0] =~ /R/);
my $write = ($ARGV[0] =~ /W/);
$ip = Net::IP->new($ip) or die ("IP invalide");
my $labnetwork = Net::IP->new('192.168.0.0/16');
if ($ip->overlaps($labnetwork) == $IP_A_IN_B_OVERLAP)
{
exit 0;
}
#else
#{
# log ERROR, "Les dépôts Git sont en cours de maintenance, veuillez réessayer dans quelques minutes.";
# exit 1;
#}
exit 0 if ($id_project eq "lse-project" && $ip->ip() eq "10.224.4.1");
exit 0 if (grep { /\Q$ENV{GL_USER}\E/ } @habitent_loin, @apping3, "icaza_fact");
my $schoolnetwork = Net::IP->new('10.41.0.0/16');
my $vjschoolnetwork = Net::IP->new('10.3.0.0/16');
if (
$ip->overlaps($schoolnetwork) != $IP_A_IN_B_OVERLAP
# && $ip->overlaps($vjschoolnetwork) != $IP_A_IN_B_OVERLAP
)
{
say "Votre IP est : ".$ip->ip();
log ERROR, "Vous n'êtes pas autorisé à envoyer vos modifications depuis cette IP." if ($write);
log ERROR, "Vous n'êtes pas autorisé à accéder à ce dépôt depuis cette IP." if ($read);
exit 1;
}
my $sshnetwork = Net::IP->new('10.41.253.0/24');
if ($ip->overlaps($sshnetwork) == $IP_A_IN_B_OVERLAP)
{
say "Votre IP est : ".$ip->ip();
log ERROR, "Vous n'êtes pas autorisé à envoyer vos modifications depuis cette IP." if ($write);
log ERROR, "Vous n'êtes pas autorisé à accéder à ce dépôt depuis cette IP." if ($read);
exit 1;
}
exit 0;

116
hooks/post-update Executable file
View file

@ -0,0 +1,116 @@
#!/usr/bin/env perl
use strict;
use warnings;
use v5.10;
use File::Basename;
use utf8;
use ACU::API::Projects;
use ACU::API::Submission;
use ACU::LDAP;
use ACU::Log;
$ACU::Log::log_file = "/var/log/hooks/" . basename($0) . ".log";
use ACU::Process;
my $promo;
my $id_project;
my $repo_login;
# First, extract information, from config then guess from repository adress
if (my $tmp = `git config hooks.promo`) { chomp $tmp; $promo = $tmp; }
if (my $tmp = `git config hooks.idproject`) { chomp $tmp; $id_project = $tmp; }
if (my $tmp = `git config hooks.login`) { chomp $tmp; $repo_login = $tmp; }
$promo = $1 if (!$promo && $ENV{'GL_REPO'} =~ m/([0-9]{4}).*/);
$id_project = $1 if (!$id_project && $ENV{'GL_REPO'} =~ m/.*\/(.*)\//);
$repo_login = $1 if (!$repo_login && $ENV{'GL_REPO'} =~ m/.*\/.*\/(.*)/);
exit(0) if (!$promo || !$id_project || !$repo_login);
for my $ref (@ARGV)
{
my $tag;
my $tag_for;
if ($ref =~ m<^refs/tags/(ACU-(.+))$>)
{
$tag = $1;
$tag_for = $2;
}
elsif ($ref =~ m<^refs/tags/(.+)$>)
{
$tag = $1;
$tag_for = $1;
}
else {
next;
}
log DEBUG, "Tag $tag ($tag_for) on repository $ENV{GL_REPO} from IP $ENV{'SSH_CLIENT'} updated.";
my $project = get_project_info($tag_for);
# Extract matching tag
my @rendus = grep {
exists $_->{vcs} and $_->{vcs}{tag} eq $tag_for;
} @{ $project->{submissions} };
if (@rendus)
{
eval
{
Process::Client::launch("send_git",
{
"year" => $promo,
"id" => $id_project,
"rendu" => $tag,
"login" => $repo_login,
# "path" => "ssh://git\@localhost/".$ENV{GL_REPO}, # Optional
},
undef, # Don't give any file
1 # Launch in background
);
};
if ($@)
{
my $err = $@;
log DEBUG, "ERROR: ".$err;
}
# Send data to API
my $last_commit = `git log "refs/tags/$tag" -1 --decorate --tags`;
eval {
API::Submission::add($promo, $id_project, $tag_for, $repo_login, $last_commit);
};
if ($@)
{
my $err = $@;
log DEBUG, "ERROR: ".$err;
log DONE, "Tag '$tag' effectué avec succès !";
}
else {
log DONE, "Tag '$tag' effectué avec succès ! Vérifiez-le sur l'intranet.";
}
}
}
exit 0;
sub get_project_info
{
my $project;
eval {
$project = API::Projects::get($id_project, $promo);
};
if ($@ or !$project)
{
my $err = $@;
log TRACE, $err;
log ERROR, "Impossible d'envoyer de tags ; si le problème persiste, passez au laboratoire.";
exit(1);
}
#log TRACE, $project;
return $project;
}

View file

@ -3,11 +3,15 @@
use strict;
use warnings;
use v5.10;
use Digest::SHA qw(sha1_base64);
use File::Basename;
use utf8;
use ACU::API::Projects;
use ACU::Defense;
use ACU::LDAP;
use ACU::Log;
$ACU::Log::log_file = undef;
$ACU::Log::log_file = "/var/log/hooks/" . basename($0) . ".log";
use ACU::Process;
# First, check if the repository is in the subjects/ directory
@ -15,7 +19,7 @@ exit 0 if ($ENV{GL_REPO} !~ /^subjects\//);
my ($ref, $oldsha, $newsha) = @ARGV;
log WARN, "This is a subject!";
log DONE, "This is a subject repository!";
my %known_tags = (
"defense" => \&tag_defense,
@ -31,7 +35,7 @@ if ($ref =~ m<^refs/tags(/.+)$>)
my $tag = $1;
my @args;
while ($tag =~ m<[:/]([^:]+)>g) {
while ($tag =~ m<[,/]([^,]*)>g) {
push @args, $1;
}
@ -56,7 +60,7 @@ sub check_xml
else {
open $fh, "|xmllint --noout -";
}
print $fh $content;
print $fh ${ $content };
close $fh;
return $?;
@ -65,43 +69,161 @@ sub check_xml
sub repository_name
{
my $repo = $ENV{GL_REPO};
$repo =~ s/^subjects\\(.*)/$1/;
$repo =~ s#subject.*/([^/]+)$#$1#;
return $repo;
}
sub tag_defense
{
my $creation = shift;
# From here, we have:
# 0: "defense"
# 1: $version
# 2: $id
# 3: $path
# 4: $year
my $version = $_[1] // 1;
my $project_id = repository_name();
if ($_[2]) {
$project_id .= "-" . $_[2];
}
$project_id = lc $project_id;
$project_id =~ s/[^a-z0-9-_]/_/g;
my $path;
if ($_[3])
{
if ($_[3] =~ /^(?:defenses\/)?([a-zA-Z0-9_.\/-]+?)(?:.xml)?$/) {
$path = "defenses/".$1.".xml";
} else {
$path = $_[3];
}
}
else
{
# Looking for an uniq defense file in defenses/
$path = qx(git ls-tree -r --name-only $ARGV[2] defenses/ | egrep '\.xml\$');
my $nb_defenses = $path =~ tr/\n//;
if ($nb_defenses > 1) {
log ERROR, "Veuillez préciser le chemin de la soutenance à utiliser avec un tag : defense,", $_[1] // "", ",", $_[2] // "", ",file_to_use";
exit 1;
}
elsif ($nb_defenses == 0) {
log ERROR, "Aucune soutenance n'a été trouvée dans le dossier defenses/";
exit 1;
}
chomp($path);
}
log WARN, "Placez votre soutenance dans le dossier defenses/." if ($path !~ /^defenses/);
my $defense_id = basename($path);
$defense_id =~ s/\.xml$//;
$defense_id =~ s/[^a-zA-Z0-9_.-]/_/g;
my $year;
if ($_[4])
{
# Check on year
if ($_[4] !~ /^\d+$/) {
log ERROR, "project:*:* second argument is the year. Tag format: project:id:year";
}
$year = $_[4];
}
else {
$year = LDAP::get_year;
}
# Determine full tag
my $long_tag;
{
my $proj_id = $_[2] // "";
$long_tag = "defense,$version,$proj_id,$path,$year";
}
if ($creation)
{
my $newref = $ARGV[2];
log INFO, "Looking for $path...";
# Check file exists
my $content = qx(git show $newref:$path);
if ($?) {
log ERROR, "Impossible de trouver la soutenance.";
}
# Check DTD validity
if (check_xml(\$content, "http://acu.epita.fr/dtd/defense.dtd")) {
log ERROR, "Corrigez les erreurs du fichier $path avant de publier la soutenance.";
}
# TODO: check user permissions
# TODO: check presence in project.xml
# Generate questions and answer id
my $defense = Defense->new(\$content);
$defense->genIds($defense_id);
# Send data to intradata
log INFO, "Attente d'un processus de publication...";
if (my $err = Process::Client::launch("intradata_get", { action => "update", type => "defense", id => $project_id, "year" => $year, "defense_id" => $defense_id, "version" => $version }, { "$defense_id.xml" => $defense->toString() }))
{
if (${ $err } ne "Ok") {
log ERROR, "Erreur durant le processus de publication : " . ${ $err };
}
}
if ($long_tag)
{
qx(git tag -f $long_tag $newref);
if (! $?) {
log INFO, "Tag long créé : $long_tag.";
}
}
}
else
{
# Is the long tag existing
qx(git tag | egrep "^$long_tag\$");
if ($?) {
log ERROR, "Tag long correspondant introuvable : $long_tag.";
}
if ($long_tag)
{
qx(git tag -d $long_tag);
if (! $?) {
log INFO, "Tag long supprimé : $long_tag.";
}
}
}
}
sub tag_document
{
}
sub tag_grades
{
}
sub tag_project
{
my $creation = shift;
# From here, we have:
# 1: "project"
# 0: "defense"
# 1: $version
# 2: $id
# 3: $year
my $version = $_[1] // 1;
my $project_id = repository_name();
if ($_[2]) {
# Check on ID/flavour_id
if ($_[2] =~ /^\d+$/) {
log ERROR, "project:* tag can't take version. Tag format: project:id:year";
}
$project_id .= "-" . $_[2];
}
$project_id = lc $project_id;
@ -111,7 +233,7 @@ sub tag_project
if ($_[3]) {
# Check on year
if ($_[3] !~ /^\d+$/) {
log ERROR, "project:*:* second argument is the year. Tag format: project:id:year";
log ERROR, "grades,*,*,* second argument is the year. Tag format: grades,version,id,year";
}
$year = $_[3];
@ -120,11 +242,108 @@ sub tag_project
$year = LDAP::get_year;
}
# Determine full tag
my $long_tag;
{
my $proj_id = $_[2] // "";
$long_tag = "grades,$version,$proj_id,$year";
}
if ($creation)
{
my $newref = $ARGV[2];
log INFO, "Création/mise à jour du projet...";
# Check file exists
my $content = qx(git show $newref:grades/grades.xml);
if ($?) {
log ERROR, "Impossible de trouver le fichier de notation.";
}
# Check DTD validity
if (check_xml(\$content, "http://acu.epita.fr/dtd/grading.dtd")) {
log ERROR, "Corrigez les erreurs du fichier grades.xml avant de lancer la génération des notes.";
}
# TODO: check user permissions
# Send data to intradata
log INFO, "Attente d'un processus de publication...";
Process::Client::launch("intradata_get", { action => "generate", type => "grades", id => $project_id, "year" => $year, "version" => $version }, { "grading.xml" => $content }, 1);
if ($long_tag)
{
qx(git tag -f $long_tag $newref);
if (! $?) {
log INFO, "Tag long créé : $long_tag.";
}
}
}
else
{
# Is the long tag existing
qx(git tag | egrep "^$long_tag\$");
if ($?) {
log ERROR, "Tag long correspondant introuvable : $long_tag.";
}
if ($long_tag)
{
qx(git tag -d $long_tag);
if (! $?) {
log INFO, "Tag long supprimé : $long_tag.";
}
}
}
}
sub tag_project
{
my $creation = shift;
# From here, we have:
# 0: "project"
# 1: $id
# 2: $year
my $project_id = repository_name();
my $flavour = "";
if ($_[1]) {
# Check on ID/flavour_id
if ($_[1] =~ /^\d+$/) {
log ERROR, "project:* tag can't take version. Tag format: project:id:year";
}
$project_id .= "-" . $_[1];
$flavour = $_[1];
}
$project_id = lc $project_id;
$project_id =~ s/[^a-z0-9-_]/_/g;
my $year;
if ($_[2]) {
# Check on year
if ($_[2] !~ /^\d+$/) {
log ERROR, "project:*:* second argument is the year. Tag format: project:id:year";
}
$year = $_[2];
}
else {
$year = LDAP::get_year;
}
# Determine full tag
my $long_tag;
if (!$_[2])
{
my $proj_id = $_[1] // "";
$long_tag = "project,$proj_id,$year";
}
if ($creation)
{
my $newref = $ARGV[2];
my $content = qx(git show $newref:project.xml);
# Check file exists
@ -133,37 +352,334 @@ sub tag_project
}
# Check DTD validity
if (check_xml($content, "http://acu.epita.fr/dtd/project.dtd")) {
if (check_xml(\$content, "http://acu.epita.fr/dtd/project.dtd")) {
log ERROR, "Corrigez les erreurs du fichier project.xml avant de lancer la création du projet.";
}
# TODO: check user permissions
# Project already online?
my $project;
eval {
$project = API::Project::get($project_id, $year);
};
if ($project) {
log INFO, "Mise à jour du projet $project_id";
}
else {
log INFO, "Création du projet $project_id";
}
# Generate token for VCS submission
my $dom = XML::LibXML->load_xml(string => (\$content));
my $mod = 0;
for my $vcs ($dom->documentElement()->getElementsByTagName("vcs"))
{
if (! $vcs->hasAttribute("tag") || $vcs->getAttribute("tag") =~ /^(ACU|YAKA)-/) {
log ERROR, "Un tag de rendu ne peut pas commencer par ACU- ou YAKA-."; # C'est réservé pour les moulettes
}
if (! $vcs->hasAttribute("token"))
{
if ($project)
{
# Looking for an old token
my @rendus = grep {
exists $_->{vcs} and $_->{vcs}{tag} eq $vcs->getAttribute("tag");
} @{ $project->{submissions} };
if (@rendus == 1)
{
log DEBUG, "Use existing token: ".$rendus[0]->{vcs}{token};
$vcs->setAttribute("token", substr($rendus[0]->{vcs}{token}, 2, 23));
$mod = 1;
next;
}
}
my $token;
do
{
$token = sha1_base64(rand);
$token =~ s/[^a-zA-Z0-9]//g;
} while (length $token < 12);
$vcs->setAttribute("token", substr($token, 2, 23));
$mod = 1;
}
}
if ($mod) {
$content = $dom->toString();
}
# Send data to intradata
log INFO, "Attente d'un processus de publication...";
log ERROR, "Erreur durant le processus de publication : $_"
if (Process::Client::launch("intradata_get", { action => "update", type => "project", id => $project_id, "year" => $year }, { "butler.xml" => $content }));
if (my $err = Process::Client::launch("intradata_get", { action => "update", type => "project", id => $project_id, "year" => $year }, { "butler.xml" => $content }))
{
if (${ $err } ne "Ok") {
log ERROR, "Erreur durant le processus de publication : " . ${ $err };
}
}
log INFO, "Information de l'intranet...";
# Call API
log ERROR, $_ if(API::Projects::add($project_id, $year));
eval {
API::Projects::add($project_id, $flavour, $year);
};
if ($@)
{
my $err = $@;
if ($err =~ /[pP]roject [aA]ll?ready [eE]xists/) {
log WARN, $err;
}
else {
log ERROR, $err;
}
}
# FIXME: Remove next line after 2016 piscine: ça ne devrait pas être fait à ce moment là
log ERROR, $_ if(API::Projects::gen_groups($project_id, $year));
log DONE, "Projet créé/mis à jour avec succès.";
if ($long_tag)
{
qx(git tag -f $long_tag $newref);
if (! $?) {
log INFO, "Tag long créé : $long_tag.";
}
}
}
else
{
# Is the long tag existing
qx(git tag | egrep "^$long_tag\$");
if ($?) {
log ERROR, "Tag long correspondant introuvable : $long_tag.";
}
log USAGE, "Suppression du projet !";
if ($long_tag)
{
qx(git tag -d $long_tag);
if (! $?) {
log INFO, "Tag long supprimé : $long_tag.";
}
}
}
}
sub tag_ref
{
my $creation = shift;
# From here, we have:
# 0: "ref"
# 1: $id
# 2: rendu-X
# 3: $year
my $project_id = repository_name();
if ($_[1]) {
# Check on ID/flavour_id
if ($_[1] =~ /^\d+$/) {
log ERROR, "ref,* tag can't take version. Tag format: ref,id,rendu,year";
}
$project_id .= "-" . $_[1];
}
$project_id = lc $project_id;
$project_id =~ s/[^a-z0-9-_]/_/g;
my $rendu;
if ($_[2]) {
$rendu = $_[2];
}
else {
$rendu = "";
}
my $year;
if ($_[3])
{
# Check on year
if ($_[3] !~ /^\d+$/) {
log ERROR, "ref,*,*,* third argument is the year. Tag format: ref,id,rendu,year";
}
$year = $_[3];
}
else {
$year = LDAP::get_year;
}
# Determine full tag
my $long_tag;
{
my $proj_id = $_[1] // "";
$long_tag = "ref,$proj_id,$rendu,$year";
}
if ($creation)
{
my $newref = $ARGV[2];
log INFO, "Création/mise à jour de la ref...";
my $content = qx(git show $newref:ref/Makefile);
# Check file exists
if ($?) {
log ERROR, "Un fichier Makefile est requis pour pouvoir compiler et exécuter la ref.";
}
log INFO, "Création de la tarball...";
my $archive = qx(git archive --format=tgz $newref ref/);
# Send data to moulette
log INFO, "Attente d'un processus de compilation...";
if (my $err = Process::Client::launch("moulette_get", {
type => "ref",
id => $project_id,
"year" => $year,
"rendu" => $rendu,
"file" => "ref_$rendu.tgz"
}, { "ref_$rendu.tgz" => $archive }))
{
if (${ $err } ne "Ok") {
log ERROR, "Erreur durant le processus de compilation : " . ${ $err };
}
}
if ($long_tag)
{
qx(git tag -f $long_tag $newref);
if (! $?) {
log INFO, "Tag long créé : $long_tag.";
}
}
}
else
{
# Is the long tag existing
qx(git tag | egrep "^$long_tag\$");
if ($?) {
log ERROR, "Tag long correspondant introuvable : $long_tag.";
}
log USAGE, "Suppression du tag de ref !";
if ($long_tag)
{
qx(git tag -d $long_tag);
if (! $?) {
log INFO, "Tag long supprimé : $long_tag.";
}
}
}
}
sub tag_tests
{
my $creation = shift;
# From here, we have:
# 0: "tests"
# 1: $id
# 2: rendu-X
# 3: $year
my $project_id = repository_name();
if ($_[1]) {
# Check on ID/flavour_id
if ($_[1] =~ /^\d+$/) {
log ERROR, "tests,* tag can't take version. Tag format: tests,id,rendu,year";
}
$project_id .= "-" . $_[1];
}
$project_id = lc $project_id;
$project_id =~ s/[^a-z0-9-_]/_/g;
my $rendu = $_[2] // "";
my $year;
if ($_[3])
{
# Check on year
if ($_[3] !~ /^\d+$/) {
log ERROR, "tests,*,*,* third argument is the year. Tag format: tests,id,rendu,year";
}
$year = $_[3];
}
else {
$year = LDAP::get_year;
}
# Determine full tag
my $long_tag;
{
my $proj_id = $_[1] // "";
$long_tag = "tests,$proj_id,$rendu,$year";
}
if ($creation)
{
my $newref = $ARGV[2];
log INFO, "Création/mise à jour de la testsuite...";
my $content = qx(git show $newref:tests/Makefile);
# Check file exists
if ($?) {
log ERROR, "Un fichier Makefile est requis pour pouvoir compiler la testsuite.";
}
log INFO, "Création de la tarball...";
my $archive = qx(git archive --format=tgz $newref tests/);
# Send data to moulette
log INFO, "Attente d'un processus de compilation...";
if (my $err = Process::Client::launch("moulette_get", {
type => "tests",
id => $project_id,
"year" => $year,
"rendu" => $rendu,
"file" => "tests_$rendu.tgz"
}, { "tests_$rendu.tgz" => $archive }))
{
if (${ $err } ne "Ok") {
log ERROR, "Erreur durant le processus de compilation : " . ${ $err };
}
}
if ($long_tag)
{
qx(git tag -f $long_tag $newref);
if (! $?) {
log INFO, "Tag long créé : $long_tag.";
}
}
}
else
{
# Is the long tag existing
qx(git tag | egrep "^$long_tag\$");
if ($?) {
log ERROR, "Tag long correspondant introuvable : $long_tag.";
}
log USAGE, "Suppression du tag de la testsuite !";
if ($long_tag)
{
qx(git tag -d $long_tag);
if (! $?) {
log INFO, "Tag long supprimé : $long_tag.";
}
}
}
}

170
hooks/submissions.pl Executable file
View file

@ -0,0 +1,170 @@
#!/usr/bin/env perl
use strict;
use warnings;
use v5.10;
use DateTime::Format::ISO8601;
use File::Basename;
use Net::IP;
use POSIX qw(strftime);
use Socket;
use utf8;
use ACU::API::Projects;
use ACU::API::Submission;
use ACU::LDAP;
use ACU::Log;
$ACU::Log::log_file = "/var/log/hooks/" . basename($0) . ".log";
use ACU::Process;
my ($ref, $oldsha, $newsha) = @ARGV;
my $promo;
my $id_project;
my $repo_login;
my @apping = qw(zinger_a zebard_w zanell_a yao_p vinois_a sraka_y soupam_j seck_a ngomsi_s morin_h milis_e menkar_m eusebe_r crief_a chhum_s boumra_n blemus_a bengan_l amasho_a);
my @expcep = qw(azerno_t baudry_v dechen_g drouin_n dupuis_a fenech_a hamdao_y lanclu_j langre_m manuel_c palson_c trang_d wajntr_a);
my @salonD = qw(aniss_i bogalh_j boulea_b cloare_l elhach_h gabrie_j kaplan_p manuel_c palson_c pizzin_a wajntr_a);
my @salonS = qw(allio_a cadet_l digius_p drouin_n dubois_d dupuis_a langre_m lim_j);
# First, extract information, from config then guess from repository adress
if (my $tmp = `git config hooks.promo`) { chomp $tmp; $promo = $tmp; }
if (my $tmp = `git config hooks.idproject`) { chomp $tmp; $id_project = $tmp; }
if (my $tmp = `git config hooks.login`) { chomp $tmp; $repo_login = $tmp; }
$promo = $1 if (!$promo && $ENV{'GL_REPO'} =~ m/([0-9]{4}).*/);
$id_project = $1 if (!$id_project && $ENV{'GL_REPO'} =~ m/.*\/(.*)\//);
$repo_login = $1 if (!$repo_login && $ENV{'GL_REPO'} =~ m/.*\/.*\/(.*)/);
exit(0) if (!$promo || !$id_project || !$repo_login);
if ($ref =~ m<^refs/tags/ACU-(.+)$>)
{
my $tag = $1;
log DEBUG, "Pushed tag for repository $ENV{GL_REPO}: $tag with IP $ENV{'SSH_CLIENT'}";
# Disallow no ACU
if ($ENV{GL_USER} ne "frotti_b" && $ENV{GL_USER} ne "chen_a" && $ENV{GL_USER} ne "boisse_r" && $ENV{GL_USER} ne "genite_n" && $ENV{GL_USER} ne "mercie_d")
{
log ERROR, "Vous n'êtes pas autorisé à envoyer ce tag.";
exit(9);
}
my $project = get_project_info($tag);
# Extract matching tag
my @rendus = grep {
exists $_->{vcs} and $_->{vcs}{tag} eq $tag;
} @{ $project->{submissions} };
if (! @rendus)
{
log ERROR, "$tag n'est pas un tag valide.";
exit(8);
}
}
elsif ($ref =~ m<^refs/tags/(.+)$>)
{
my $tag = $1;
log DEBUG, "Pushed tag for repository $ENV{GL_REPO}: $tag with IP $ENV{'SSH_CLIENT'}";
my $project = get_project_info($tag);
# Extract matching tag
my @rendus = grep {
exists $_->{vcs} and $_->{vcs}{tag} eq $tag;
} @{ $project->{submissions} };
if (@rendus)
{
if ($newsha eq '0' x 40)
{
log USAGE, "Mais pour quelle raison voudriez-vous supprimer un tag ?!";
exit(7);
}
chomp (my $tokengiven = `git cat-file tag $newsha 2> /dev/null | sed -e '1,/^\$/d'`);
if (! check_submission_date($tokengiven, @rendus))
{
exit (9);
}
}
else
{
log ERROR, "$tag n'est pas un tag valide.";
exit(8)
}
}
exit 0;
sub get_project_info
{
my $project;
eval {
$project = API::Projects::get($id_project, $promo);
};
if ($@ or !$project)
{
my $err = $@;
log TRACE, $err;
log ERROR, "Impossible d'envoyer de tags ; si le problème persiste, passez au laboratoire.";
exit(1);
}
log TRACE, $project;
return $project;
}
sub check_submission_date
{
my $tokengiven = shift;
my $glts = DateTime::Format::ISO8601->parse_datetime(
do {
my $t = $ENV{'GL_TS'};
$t =~ tr/./T/;
$t
});
for my $rendu (@_)
{
my $open = DateTime::Format::ISO8601->parse_datetime($rendu->{period}{begin});
my $close = DateTime::Format::ISO8601->parse_datetime($rendu->{period}{end});
if (($id_project eq "bistromathique" || $id_project eq "pthl") && grep { $_ eq $repo_login } @expcep)
# if (($id_project eq "bistromathique" || $id_project eq "pthl") && "pizzin_a" eq $repo_login)
{
# $open = DateTime::Format::ISO8601->parse_datetime("2013-12-19T18:00:00");
$close = DateTime::Format::ISO8601->parse_datetime("2013-12-22T19:42:00");
}
say "Date courante : ", $glts->strftime("%d/%m/%Y %H:%M:%S");
if (DateTime->compare($glts, $open) == -1)
{
say "Date d'ouverture : ", $open->strftime("%d/%m/%Y %H:%M:%S");
log ERROR, "Tag rejeté : le rendu n'est pas encore ouvert.";
exit(4);
}
say "Date de fermeture : ", $close->strftime("%d/%m/%Y %H:%M:%S");
if (DateTime->compare($glts, $close) == 1)
{
log ERROR, "Tag rejeté : le rendu est clos.";
exit(5);
}
my $token = $rendu->{vcs}{token};
if ($token ne "" and $token ne $tokengiven and $newsha ne '0' x 40)
{
log ERROR, "Tag rejeté : mauvais token.";
exit(6);
}
}
return 1;
}

View file

@ -6,30 +6,40 @@ then
exit 1
fi
clean_tex()
tex2md()
{
for f in data Makefile images/acu.pdf images/assistants.pdf images/assistants-subject.pdf images/assistants-slides.pdf images/assistants.png images/epita.pdf images/epita.png images/epita-invert.pdf images/assistants-invert.pdf images/epita-invert.png *.cls *.sty *.tex
do
if [ -f "$f" ]
then
git rm -f "$f" > /dev/null
elif [ -d "$f" ]
then
git rm -fr "$f" > /dev/null
fi
done
if [ -z "$1" ]
then
echo "tex2md: No argument given"
exit 2
fi
DEST="$1"
cd include
for i in `find -type f -name '*.tex'`
do
bi=`basename "$i"`
echo -e "\e[1;34m>>>\e[1;37m Trying to convert $i to Markdown...\e[0m"
sed -Ei 's/\\include *\{([^}]+)}/\\verb+~include(\1)+/gi' "$i"
sed -Ei 's/\\input *\{([^}]+)}/\\verb+~include(\1)+/gi' "$i"
sed -Ei 's/\{\\include *([^}]+)}/\\verb+~include(\1)+/gi' "$i"
sed -Ei 's/\{\\input *([^}]+)}/\\verb+~include(\1)+/gi' "$i"
# BEGIN HACK! Need stacking
sed -Ei 's/\\(lstinline|class|expected|refer)[^{]*\{([^}]*)\}/\\verb+\2+/gi' "$i"
sed -Ei 's/\\distribution\{\}/FreeBSD 9/gi' "$i"
sed -Ei 's/\\\{/__OPEN_BRACKET_MINIROOT__/gi' "$i"
sed -Ei 's/\\\}/__CLOSE_BRACKET_MINIROOT__/gi' "$i"
sed -Ei 's/-\{\}-//gi' "$i"
#sed -Ei 's/\\_/_/gi' "$i"
# DIRTY HACK
sed -Ei 's/\\includegraphics *\{([^}]+)}/\\verb+%%image(\1)+/gi' "$i"
sed -Ei 's/\\include *\{([^}]+)}/\\verb+%%scoped-include(\1)+/gi' "$i"
sed -Ei 's/\\input *\{([^}]+)}/\\verb+%%scoped-include(\1)+/gi' "$i"
sed -Ei 's/\{\\include *([^}]+)}/\\verb+%%scoped-include(\1)+/gi' "$i"
sed -Ei 's/\{\\input *([^}]+)}/\\verb+%%scoped-include(\1)+/gi' "$i"
sed -Ei 's/\\lstinputlisting *\{([^}]+)\}/\\verb+%%scoped-include(\1)+/gi' "$i"
sed -Ei 's/\\lstinline *\{([^}]+)}/\\verb+\1+/gi' "$i"
sed -Ei 's/\\structure\{([^}]+)}/\1/gi' "$i"
sed -Ei 's/\\struct\{([^}]+)}/\1/gi' "$i"
sed -Ei 's/\\link\{([^}]+)}/\1/gi' "$i"
sed -Ei 's/\\textasciitilde\{\}/~/gi' "$i"
sed -Ei 's/\\begin *\{correction\}/\\begin\{verbatim\}/g' "$i"
sed -Ei 's/\\end *\{correction\}/\\end\{verbatim\}/g' "$i"
sed -Ei 's/\\begin *\{prompt\}/\\begin\{verbatim\}/g' "$i"
@ -40,6 +50,12 @@ clean_tex()
sed -Ei 's/\\end *\{cartouche\}/\\end\{verbatim\}/g' "$i"
sed -Ei 's/\\begin *\{cartouche_nospaces\}/\\begin\{verbatim\}/g' "$i"
sed -Ei 's/\\end *\{cartouche_nospaces\}/\\end\{verbatim\}/g' "$i"
sed -Ei 's/\\verb ([^+]+) /\\verb+\1+/g' "$i"
# Special macros
sed -Ei 's/\\(file|email|command|bcode|code) *\{([^}]*)\}/\\verb+\2+/gi' "$i"
sed -Ei 's/\\begin *\{assistant\}/\\verb+%%assistant-begin+/g' "$i"
sed -Ei 's/\\end *\{assistant\}/\\verb+%%assistant-end+/g' "$i"
# Convert Beamer
sed -Ei 's/\\begin\[[^]]+\]\{frame\}\{([^}]+)\}/\\subsection\{\1\}/g' "$i"
@ -57,21 +73,24 @@ clean_tex()
sed -Ei 's/\\frame//g' "$i"
sed -Ei 's/\\item( *)<[^>]+>/\\item\1/g' "$i"
if pandoc -o ../${bi%%.tex}.md $i
# END HACK!
sed -Ei 's/__OPEN_BRACKET_MINIROOT__/\{/gi' "$i"
sed -Ei 's/__CLOSE_BRACKET_MINIROOT__/\}/gi' "$i"
if pandoc -o "$DEST"/${bi%%.tex}.md $i
then
git add ../${bi%%.tex}.md
git add "$DEST"/${bi%%.tex}.md
git checkout "$i"
git rm -f "$i" > /dev/null
fi
sed -Ei 's/`~?include\(([^)]+)\)`/~include(\1)/gi' "../${bi%%.tex}.md"
sed -Ei 's/`%%([a-z-]+)\(([^)]+)\)`/%%\1(\2)/gi' "$DEST/${bi%%.tex}.md"
sed -Ei 's/\\$/\n/' "$DEST/${bi%%.tex}.md"
done
if [ `find | wc -l` -gt 1 ]
then
git mv * ..
fi
cd ..
}
maintex2md()
{
if [ -f "mySubject.md" ]
then
git mv "mySubject.md" "main.md"
@ -85,8 +104,76 @@ clean_tex()
then
git mv "myTutorial.md" "main.md"
fi
}
rmdir include
clean_tex()
{
if [ -z "$1" ] || ! [ -d "$1" ]
then
echo "NON"
exit 1;
fi
for f in data Makefile images/acu.pdf images/assistants.pdf images/assistants-subject.pdf images/assistants-slides.pdf images/assistants.png images/epita.pdf images/epita.png images/epita-invert.pdf images/assistants-invert.pdf images/epita-invert.png images/assistants-bg.png images/logo_epita.jpg images/acu-bottom.png images/acu-bottom.pdf images/acu-bg.pdf images/acu2011.png images/acu.png images/acu_2012_logo_hd.png *.cls *.sty *.toc
do
if [ -f "$f" ]
then
git rm -f "$f" > /dev/null
elif [ -d "$f" ]
then
git rm -fr "$f" > /dev/null
fi
done
for file in `find -name "*.ltx"`
do
git mv "$file" "${file%%.ltx}.tex"
done
if [ -d "include" ]
then
cd include
tex2md ..
if [ `find | wc -l` -gt 1 ]
then
git mv * ..
fi
cd "$1"
tex2md .
maintex2md
rmdir include 2> /dev/null
elif [ -d "subdocs" ]
then
cd subdocs
tex2md ..
if [ `find | wc -l` -gt 1 ]
then
git mv * ..
fi
cd "$1"
tex2md .
maintex2md
rmdir include 2> /dev/null
elif [ `find -mindepth 1 -maxdepth 1 -name '*.tex' | wc -l` -gt 0 ]
then
tex2md .
else
for i in *
do
if [ -d "$i" ]
then
echo -e "\e[1;32m>>>\e[1;37m Subsubject found: $i\e[0m"
cd "$i"
clean_tex "$1/$i" "$1"
fi
done
fi
cd "$2"
}
TMPDIR=`mktemp -d`
@ -116,9 +203,9 @@ then
exit 4
fi
cd ..
cd - > /dev/null
rm -rf "$1"
mv "$1" "$1.hg"
git clone "$TMPDIR/repo.git" "$1"
@ -144,8 +231,8 @@ if ls | grep "moulette"
then
echo -e "\e[1;34m>>>\e[1;37m Creating moulette branch...\e[0m"
git checkout -b moulette
find -mindepth 1 -maxdepth 1 ! -name moulette ! -name .git -exec git rm -rf {} \;
find -mindepth 1 -maxdepth 1 ! -name moulette ! -name tests ! -name .git -exec git rm -rf {} \;
git rm -f moulette/DESC 2> /dev/null
git commit -am "Converting HG to Git" > /dev/null
@ -173,6 +260,7 @@ echo
echo -e "\e[1;31m##\e[1;37m Removing old and temporary files \e[1;31m##\e[0m"
git rm -f AUTHORS
git rm -f README
git rm -f UPDATE
git rm -f Makefile
git rm -f files/list
git rm -f "files/*.pdf"
@ -181,6 +269,7 @@ find -name 'ChangeLog' -exec git rm -fr {} \;
find -name 'DESC' -exec git rm -fr {} \;
find -name '*.old' -exec git rm -fr {} \;
find -name '*.bak' -exec git rm -fr {} \;
find -name '*.vrb' -exec git rm -fr {} \;
find -name '*~' -exec git rm -fr {} \;
find -name '#*#' -exec git rm -fr {} \;
echo -e "\e[1;31m## ## ## ## ##\e[0m"
@ -197,13 +286,13 @@ do
do
if [ -f "$D/template.xml" ]
then
~/new_intra/defenses/defense_converter.pl -o "$D.xml" "$D/template.xml"
perl `dirname $0`/defense_converter.pl -o "$D.xml" "$D/template.xml"
git add "$D.xml"
echo -e "\e[1;35m>>>\e[1;37m Defense converted:\e[0m $D"
fi
git rm -rf "$D" > /dev/null
done
cd ..
cd - > /dev/null
echo -e "\e[1;35m## ## ## ## ##\e[0m"
echo
@ -214,6 +303,13 @@ do
echo -e "\e[1;36m## ## ## ## ##\e[0m"
echo
elif [ "$DIR" = "tests" ]
then
echo -e "\e[1;33m##\e[1;37m Find directory $DIR for moulette \e[1;33m##\e[0m"
git rm -rf "$DIR"
echo -e "\e[1;33m## ## ## ## ##\e[0m"
echo
elif find "$DIR" -type f -name '*.yml' | grep yml > /dev/null
then
echo -e "\e[1;33m##\e[1;37m Find directory $DIR with some .yml files \e[1;33m##\e[0m"
@ -225,8 +321,7 @@ do
then
echo -e "\e[1;32m##\e[1;37m Find directory $DIR with some .tex files \e[1;32m##\e[0m"
cd "$DIR"
clean_tex "$DIR"
cd ..
clean_tex `pwd` `readlink -f "$(pwd)/.."`
echo -e "\e[1;32m## ## ## ## ##\e[0m"
echo
@ -253,7 +348,19 @@ do
git rm -rf "$f" > /dev/null
fi
done
cd ..
# Append Fact lines
if [ -f "Makefile" ]
then
cat <<EOF >> Makefile
fact:
rm -rf ref.ff
\${FACT} package create ../ref ref.ff
\${FACT} make make ref.ff ref.ff
EOF
fi
cd - > /dev/null
fi
done

200
process/exec/guantanamo.pl Normal file
View file

@ -0,0 +1,200 @@
#!/usr/bin/env perl
use v5.10.1;
use strict;
use warnings;
use Gearman::Worker;
use MIME::Base64;
use XML::LibXML;
use ACU::LDAP;
use ACU::Log;
use ACU::Process;
my %master_actions =
(
"launch" => \&master_launch,
"list" => \&master_list,
"register" => \&master_register,
);
my @nodes;
sub master_register
{
my $args = shift;
if ($args->{param}{nodename})
{
my $nodename = $args->{param}{nodename};
if (! grep { $_ eq $nodename } @nodes)
{
log INFO, "New node: $nodename";
push @nodes, "$nodename";
}
else {
log WARN, "Node $nodename alredy registered";
}
}
else {
log WARN, "nodename empty, cannot register new node";
}
}
sub master_list
{
my $doc = XML::LibXML::Document->new('1.0');
my $root = $doc->createElement("process");
for my $target (@nodes)
{
my $t = $doc->createElement("target");
$t->setAttribute("name", $target);
$root->appendChild($t);
}
$doc->setDocumentElement( $root );
return $doc->toString();
}
sub build_task_xml
{
my $files = shift;
my $subtree = shift;
my $doc = XML::LibXML::Document->new('1.0');
my $root = $doc->createElement("guantanamo");
$doc->setDocumentElement( $root );
log TRACE, $subtree;
if ($files)
{
log TRACE, $files;
for my $key (keys %{ $files })
{
my $file = $doc->createElement("file");
$file->addChild( $doc->createAttribute("name", $key) );
$file->addChild( $doc->createAttribute("encoding", "base64") );
$file->appendText(encode_base64($files->{$key}));
$root->appendChild($file);
}
}
if ($subtree) {
$subtree->recreateNode($doc, $root);
}
my $ret = $doc->toString();
log TRACE, $ret;
return $ret;
}
sub master_launch
{
my $args = shift;
my @lnodes;
my @warn;
if ($args->{unamed})
{
for (my $i = $args->{unamed}; $i > 0; $i--)
{
if (grep { $args->{param}{$i} eq $_ } @nodes) {
push @lnodes, $args->{param}{$i};
} else {
push @warn, $args->{param}{$i}." not a currently launched architecture.";
}
}
}
else {
@lnodes = @nodes;
}
log DEBUG, "Launching nodes...";
my %ret;
my $client = Gearman::Client->new;
$client->job_servers('gearmand:4730');
my $taskset = $client->new_task_set;
for my $node (@lnodes)
{
log DEBUG, "Launching $node...";
$taskset->add_task(
"guantanamo_".$node => build_task_xml($args->{files}, $args->{subtree}),
{
on_complete => sub {
my $dom = XML::LibXML->load_xml(string => ${ $_[0] });
$ret{ $node } = $dom;
}
});
}
$taskset->wait;
if ($args->{subtree}->hasAttribute("output") && $args->{subtree}->getAttribute("output") eq "text")
{
my $output = "";
for my $w (@warn) {
$output .= $w."\n";
}
for my $node (@lnodes) {
my @o = $ret{$node}->documentElement->getElementsByTagName("out");
if (@o) {
$output .= $o[0]->firstChild->nodeValue;
}
my @e = $ret{$node}->documentElement->getElementsByTagName("err");
if (@e) {
$output .= $e[0]->firstChild->nodeValue;
}
$output .= $e[0]->firstChild->nodeValue;
}
return $output;
}
else
{
my $doc = XML::LibXML::Document->new('1.0');
my $root = $doc->createElement("process");
$doc->setDocumentElement( $root );
for my $w (@warn)
{
my $warning = $doc->createElement("warning");
$warning->appendText($w);
$root->appendChild($warning);
}
for my $k (keys %ret)
{
$root->appendChild($ret{ $k }->documentElement);
}
return $doc->toString();
}
}
sub process_master
{
my ($given_args, $args) = @_;
my $action = $args->{param}{action} // "launch";
if (! exists $master_actions{$action}) {
log WARN, "Unknown action '$action' for guantanamo master process.";
}
return $master_actions{$action}($args);
}
log INFO, "Starting guantanamo.pl as master process";
Process::add_server("gearmand:4730");
Process::register("guantanamo", \&process_master);

View file

@ -0,0 +1,115 @@
#!/usr/bin/env perl
use v5.10.1;
use strict;
use warnings;
use Carp;
use File::Path qw(make_path remove_tree);
use File::Temp qw/tempfile tempdir/;
use IPC::Open3;
use XML::LibXML;
use ACU::Log;
use ACU::Process;
my %node_actions =
(
"launch" => \&node_launch,
);
sub node_launch
{
my $args = shift;
# First, create a temporary directory
my $dir = tempdir();
chdir( $dir );
# Extract all files to current directory
for my $filename (keys %{ $args->{files} })
{
open my $fh, ">", $filename or croak("$filename: $!");
print $fh $args->{files}{$filename};
close $fh;
}
my $doc = XML::LibXML::Document->new('1.0');
my $root = $doc->createElement("target");
$root->addChild( $doc->createAttribute("name", $ARGV[0]) );
$doc->setDocumentElement( $root );
for my $c ($args->{subtree}->getElementsByTagName("command"))
{
if (! exists $c->{attributes}{target} ||
index($c->{attributes}{target}, $ARGV[0]) != -1) {
my $cmd = $doc->createElement("cmd");
if (! exists $c->{attributes}{hide}) {
$root->appendChild($cmd);
}
my $command = $doc->createElement("command");
$command->appendText($c->{nodeValue});
$cmd->appendChild($command);
my($wtr, $rdr, $rv);
my $stderr = "";
eval {
my $pid = open3($wtr, $rdr, $stderr, "sh", "-c", $c->{nodeValue});
waitpid( $pid, 0 );
$rv = $? >> 8;
};
if ($@)
{
$stderr = $@ . $stderr;
$rv = -1;
}
my $out = $doc->createElement("out");
my $str = "";
if ($rdr) {
$str .= $_ while (<$rdr>);
}
$out->appendText($str);
$cmd->appendChild($out);
my $err = $doc->createElement("err");
$str = "";
if ($stderr) {
$str .= $_ while (<$stderr>);
}
$err->appendText($str);
$cmd->appendChild($err);
my $ret = $doc->createElement("return");
$ret->appendText($rv);
$cmd->appendChild($ret);
}
}
chdir();
remove_tree( $dir );
return $doc->toString();
}
sub process_node
{
my ($given_args, $args) = @_;
my $action = $args->{param}{action} // "launch";
if (! exists $node_actions{$action}) {
warn "Unknown action '$action' for guantanamo node process.";
}
return $node_actions{$action}($args);
}
if ($#ARGV == 0)
{
log INFO, "Starting guantanamo.pl as node process";
Process::Client::launch("guantanamo", {"action" => "register", "nodename" => $ARGV[0]}, undef, 1);
Process::register("guantanamo_".$ARGV[0], \&process_node);
}

View file

@ -0,0 +1,138 @@
#!/usr/bin/env sh
cd $(dirname "$0")
GREP='/usr/bin/env grep -E'
SCREEN='/usr/bin/env screen'
SED='/usr/bin/env sed -E'
if [ `uname -s` = "FreeBSD" ]; then
SU="/usr/bin/env su"
else
SU='/usr/bin/env su -s /bin/sh'
fi
PERL='/usr/bin/env perl'
# Install missing packages
DEB_PACKAGES_LIST="screen libxml-libxml-perl libgearman-client-perl"
ARCH_PACKAGES_LIST="screen"
GENTOO_PACKAGES_LIST="app-misc/screen dev-perl/XML-LibXML"
FBSD_PACKAGES_LIST="screen p5-XML-LibXML p5-Gearman p5-Term-ANSIColor"
KERNEL=`uname -s`
if [ "$KERNEL" = "FreeBSD" ]
then
for PK in `echo $FBSD_PACKAGES_LIST`
do
if ! pkg info "$PK" > /dev/null 2> /dev/null
then
if ! PACKAGESITE="http://canon.acu.epita.fr/repo-lab" pkg install "$PK"
then
echo "Error during installation of $PK"
exit 1
fi
fi
done
if ! getent passwd | grep "guantanamo:" > /dev/null 2> /dev/null
then
pw useradd guantanamo -u 941 -d /home/guantanamo -s /bin/false
fi
elif [ "$KERNEL" = "Linux" ]
then
if [ -f "/etc/debian_version" ]
then
if ! whereis dpkg > /dev/null 2> /dev/null
then
if ! aptitude install dpkg
then
echo "Error during installation of $PK"
exit 1
fi
fi
for PK in $DEB_PACKAGES_LIST
do
if ! dpkg -l | grep "^ii" | grep "$PK" > /dev/null 2> /dev/null
then
aptitude install "$PK"
fi
done
elif [ -f "/etc/arch-release" ]
then
for PK in $ARCH_PACKAGES_LIST
do
if ! pacman -Qi "$PK" > /dev/null 2> /dev/null
then
if ! pacman -S "$PK"
then
echo "Error during installation of $PK"
exit 1
fi
fi
done
elif [ -f "/etc/gentoo-release" ]
then
for PK in $GENTOO_PACKAGES_LIST
do
if ! equery list "$PK" > /dev/null 2> /dev/null
then
if ! emerge "$PK"
then
echo "Error during installation of $PK"
exit 1
fi
fi
done
else
echo "Unsupported GNU/Linux distribution :("
exit 1;
fi
# Add guantanamo user if missing
if ! getent passwd | grep "guantanamo:" > /dev/null 2> /dev/null
then
useradd --shell /bin/false --uid 941 guantanamo &&
mkdir -p /home/guantanamo
fi
chown -R guantanamo:guantanamo /home/guantanamo
else
echo "Unsupported operating system :("
exit 1;
fi
chown -R guantanamo .
if [ $# -gt 0 ]
then
ARCHNAME=$1
else
echo "Expected at first argument: node name. For example: hurd-ia64"
exit 1
fi
CMD="$SCREEN -S 'guantanamo_$ARCHNAME' -d -m sh -c 'while true; do perl guantanamo_node.pl $ARCHNAME; done'"
if [ "x$UID" = "x0" ]
then
echo "$CMD" | $SU guantanamo
else
$CMD
fi

View file

@ -3,22 +3,36 @@
use v5.10.1;
use strict;
use warnings;
use Carp;
use Pod::Usage;
use lib "../../";
use ACU::API::Projects;
use ACU::Log;
use ACU::LDAP;
use ACU::Grading;
use ACU::Process;
use ACU::Trace;
our $basedir = "/intradata";
my %actions = (
"defense" => {
"update" => \&update_defense,
},
"grades" => {
"new_bonus" => \&grades_new_bonus,
"generate" => \&grades_generate,
},
"project" => {
"create" => \&update_project,
"update" => \&update_project,
"delete" => \&delete_project,
}
},
"trace" => {
"update" => \&update_trace,
},
);
sub create_tree($$)
@ -26,19 +40,261 @@ sub create_tree($$)
my $year = shift;
my $project_id = shift;
if (! -d "$basedir/$year/") {
log ERROR, "No directory for year $year. Ask a root to create it.";
return "No directory for year $year. Ask a root to create it.";
}
croak "No directory for year $year. Ask a root to create it." if (! -d "$basedir/$year/");
if (! -e "$basedir/$year/$project_id/") {
mkdir "$basedir/$year/$project_id/";
mkdir "$basedir/$year/$project_id/" or die $!;
}
return 0;
}
sub grades_generate
{
my $args = shift;
my $project_id = $args->{param}{id};
my $year = $args->{param}{year} // LDAP::get_year;
croak "No project_id given." if (! $project_id);
if (! -e "$basedir/$year/$project_id/grades/") {
mkdir "$basedir/$year/$project_id/grades/" or die $!;
}
log DEBUG, "Generate list of students";
# Get groups from the intranet
my $groups = API::Projects::get_groups($project_id, $year);
# Create list of students to generate
my @logins;
if ($args->{unamed})
{
for (my $i = $args->{unamed}; $i > 0; $i--) {
push @logins, $args->{param}{$i};
}
}
else
{
map {
for my $member (@{ $_->{stds} }) {
push @logins, $member->{login};
}
} @{ $groups->{groups} };
}
log TRACE, @logins;
# Load grading file
my $grading;
if (exists $args->{files}{"grading.xml"}) {
$grading = $args->{files}{"grading.xml"};
}
croak "Invalid grading.xml received!" if (! $grading);
$grading = Grading->new($grading);
opendir(my $dh, "$basedir/$year/$project_id/traces/") or croak "can't opendir $basedir/$year/$project_id/traces/: $!";
my @trace_dirs = grep { ( ! /^\./ ) && -d "$basedir/$year/$project_id/traces/$_" } readdir($dh);
closedir $dh;
for my $login (@logins)
{
my @files;
log DEBUG, "Generating grades for $login";
for my $dir (@trace_dirs)
{
log DEBUG, "Will fetch identifiers from $dir";
# Looking for a group traces first
for my $grp (@{ $groups->{groups} })
{
my $this = 0;
my $chief;
for my $member (@{ $grp->{stds} })
{
if ($member->{chief} eq "true" or $member->{chief} eq "1" or $member->{chief} eq "chief")
{
$chief = $member;
next;
}
$this = 1 if ($member->{login} eq $login);
}
if ($this && $chief)
{
if (-f "$basedir/$year/$project_id/traces/$dir/".$chief->{login}.".xml") {
push @files, "$basedir/$year/$project_id/traces/$dir/".$chief->{login}.".xml";
}
last;
}
}
if (-f "$basedir/$year/$project_id/traces/$dir/$login.xml") {
push @files, "$basedir/$year/$project_id/traces/$dir/$login.xml";
}
}
for my $path (@files)
{
open my $xmltrace, "<", "$path" or die "$path: $!";
binmode $xmltrace;
my $trace = Trace->new(join '', <$xmltrace>);
close $xmltrace;
log DEBUG, "Fill from file: $path";
log TRACE, $trace->getIds($login);
$grading->fill($trace->getNonZeroIds($login));
}
log DEBUG, "Computed grades: ".$grading->compute($login);
open my $xmlgrade, ">", "$basedir/$year/$project_id/grades/$login.xml" or croak "grades/$login.xml: $!";
binmode $xmlgrade;
print $xmlgrade $grading->computeXML($login);
close $xmlgrade;
$grading->reset();
}
return 1;
}
sub grades_new_bonus
{
my $args = shift;
my $project_id = $args->{param}{id};
my $delete = $args->{param}{delete};
my $year = $args->{param}{year} // LDAP::get_year;
croak "No project_id given" if (! $project_id);
die "No such project $project_id in $year" if (! -d "$basedir/$year/$project_id/");
if (! -e "$basedir/$year/$project_id/traces/") {
mkdir "$basedir/$year/$project_id/traces/" or die $!;
}
if (! -e "$basedir/$year/$project_id/traces/bonus/") {
mkdir "$basedir/$year/$project_id/traces/bonus/" or die $!;
}
for my $kfile (keys %{ $args->{files} })
{
log DEBUG, "Reading file $kfile";
my $kbonus = $kfile;
$kbonus =~ s/[^a-zA-Z0-9_-]/_/g;
my @lines = split(/\n/, $args->{files}{$kfile});
log TRACE, $args->{files}{$kfile};
log TRACE, @lines;
my $value;
$value = 1 if (!$delete);
# Looking for a global value
if ($lines[0] =~ /^(\d+)$/) {
$value = $1;
log INFO, "Setting global value to $value";
shift @lines;
}
for my $line (@lines)
{
if ($line =~ /^([a-z0-9_-]+)(?:\s*:\s*(-?[0-9.]+))?$/)
{
my $login = $1;
my $tvalue = $2 // $value;
my $trace;
if ($delete) {
log DEBUG, "Deleting bonus for $login";
} else {
log DEBUG, "Applying bonus for $login:$tvalue";
}
if (-e "$basedir/$year/$project_id/traces/bonus/$login.xml") {
open my $xml, "<", "$basedir/$year/$project_id/traces/bonus/$login.xml" or die $!;
binmode $xml;
$trace = Trace->new(join '', <$xml>);
close $xml;
}
elsif ($delete) {
next;
}
else {
$trace = Trace->new();
}
if ($delete) {
if ($tvalue && $tvalue == $trace->getIds($kbonus)) {
$trace->delId($kbonus);
} else {
$trace->delId($kbonus);
}
} else {
my $e = $trace->addId($kbonus, $tvalue);
$e->changeWho($login, "login");
}
log DEBUG, "Updating $basedir/$year/$project_id/traces/bonus/$login.xml";
open my $xml, ">", "$basedir/$year/$project_id/traces/bonus/$login.xml" or die $!;
print $xml $trace->toString();
close $xml;
}
else {
warn "Invalid login $line, line skiped";
}
}
}
return 1;
}
sub update_defense
{
my $args = shift;
my $project_id = $args->{param}{id};
my $year = $args->{param}{year} // LDAP::get_year;
croak "No project_id given" if (! $project_id);
my $defense_id = $args->{param}{defense_id};
croak "No defense_id given" if (! $defense_id);
my $defense;
if (exists $args->{files}{"$defense_id.xml"}) {
$defense = $args->{files}{"$defense_id.xml"};
}
croak "Invalid $defense_id.xml received!" if (! $defense);
log INFO, "Update $year/$project_id/defenses/$defense_id.xml";
if (! -e "$basedir/$year/$project_id/defenses/") {
mkdir "$basedir/$year/$project_id/defenses/" or die $!;
}
if (! -e "$basedir/$year/$project_id/traces/") {
mkdir "$basedir/$year/$project_id/traces/" or die $!;
}
if (! -e "$basedir/$year/$project_id/traces/defense_$defense_id/") {
mkdir "$basedir/$year/$project_id/traces/defense_$defense_id/" or die $!;
my ($login, $pass, $uid, $gid) = getpwnam("www-data");
chown $uid, $gid, "$basedir/$year/$project_id/traces/defense_$defense_id/";# or die $!; #FIXME
chmod 0775, "$basedir/$year/$project_id/traces/defense_$defense_id/" or die $!;
}
open my $out, ">", "$basedir/$year/$project_id/defenses/$defense_id.xml" or die $!;
print $out $defense;
close $out;
return 1;
}
sub update_project
{
my $args = shift;
@ -46,29 +302,63 @@ sub update_project
my $project_id = $args->{param}{id};
my $year = $args->{param}{year} // LDAP::get_year;
if (! $project_id) {
log ERROR, "No project_id given.";
return "No project_id given";
}
croak "No project_id given" if (! $project_id);
my $butler;
if (exists $args->{files}{"butler.xml"}) {
$butler = $args->{files}{"butler.xml"};
}
if (! $butler) {
log ERROR, "Invalid butler.xml received!";
return "Invalid butler.xml received!";
}
croak "Invalid butler.xml received!" if (! $butler);
log INFO, "Update $year/$project_id/butler.xml";
return $_ if (create_tree($year, $project_id));
create_tree($year, $project_id);
open my $out, ">", "$basedir/$year/$project_id/butler.xml";
print $out $butler;
close $out;
return "Ok";
return 1;
}
sub update_trace
{
my $args = shift;
my $project_id = $args->{param}{id};
my $year = $args->{param}{year} // LDAP::get_year;
croak "No project_id given" if (! $project_id);
my $rendu_id = $args->{param}{rendu};
croak "No rendu_id given" if (! $rendu_id);
my $login = $args->{param}{login};
croak "No login given" if (! $login);
my $trace;
if (exists $args->{files}{"$login.xml"}) {
$trace = $args->{files}{"$login.xml"};
}
croak "Invalid $login.xml received!" if (! $trace);
log INFO, "Update $year/$project_id/traces/$rendu_id/$login.xml";
if (! -e "$basedir/$year/$project_id/traces/") {
mkdir "$basedir/$year/$project_id/traces/" or die $!;
}
if (! -e "$basedir/$year/$project_id/traces/$rendu_id/") {
mkdir "$basedir/$year/$project_id/traces/$rendu_id/" or die $!;
chmod 0755, "$basedir/$year/$project_id/traces/$rendu_id/" or die $!;
}
open my $out, ">", "$basedir/$year/$project_id/traces/$rendu_id/$login.xml" or croak("Unable to write to $rendu_id/$login.xml");
print $out $trace;
close $out;
return 1;
}
sub delete_project
@ -84,12 +374,18 @@ sub process_get
my $type = $args->{param}{type};
my $action = $args->{param}{action} // "update";
if (! exists $actions{$type}{$action}) {
log WARN, "Unknown action '$action' for $type.";
return "Unknown action '$action' for $type.";
}
croak "Unknown action '$action' for $type." if (! exists $actions{$type}{$action});
eval {
$actions{$type}{$action}($args);
};
if ($@) {
my $err = $@;
log ERROR, $err;
return $err;
}
return "Ok";
return $actions{$type}{$action}($args);
}
Process::register("intradata_get", \&process_get);

View file

@ -0,0 +1,378 @@
#! /usr/bin/env perl
use v5.10.1;
use strict;
use warnings;
use threads;
use threads::shared;
use Carp;
use File::Basename;
use File::Compare;
use File::Copy;
use File::Path qw(remove_tree mkpath);
use File::Temp qw/tempfile tempdir/;
use Sys::Gamin;
use ACU::Log;
use ACU::Process;
my %actions = (
"std" => \&receive_std, #STuDent
"ref" => \&receive_ref,
"tests" => \&create_testsuite,
"moulette" => \&moulette,
);
my %monitored_dir = ();
sub jail_exec
{
my $cmd = shift;
qx(jexec moulette1 /bin/sh -c "FACT='/usr/local/bin/mono /usr/local/fact/FactExe.exe' $cmd");
croak "Erreur while executing '$cmd'" if ($?);
}
sub fact_exec
{
my $cmd = shift;
my $rundir = shift;
# Check that Fact is running
qx/pgrep mono/;
while ($?)
{
log ERROR, "Fact is not running ... waiting for respawn";
sleep(10);
qx/pgrep mono/;
}
jail_exec("cd '$rundir' && /usr/local/bin/mono /usr/local/fact/FactExe.exe $cmd");
}
sub prepare_dir
{
my $year = shift;
my $project_id = shift;
my $rendu = shift;
my @dirs = ("/data/work/$year-$project_id-$rendu/", "/data/output/$year-$project_id-$rendu/", "/data/files/$year-$project_id-$rendu/");
for my $dir (@dirs)
{
if (! -d $dir) {
mkpath($dir) or croak "An error occurs while creating directory: $!";
}
my ($login, $pass, $uid, $gid) = getpwnam("intradmin");
chown $uid, $gid, $dir;
chmod 0770, $dir;
}
return @dirs;
}
sub receive_ref
{
my $args = shift;
my $project_id = $args->{param}{id};
my $year = $args->{param}{year};
my $rendu = $args->{param}{rendu};
my $file = $args->{param}{file};
croak "No file named '$file' given" if (!exists $args->{files}{$file});
my $tempdir = tempdir(DIR => '/data/tmp');
open my $fh, "|tar -xz -f - -C '$tempdir'";
print $fh $args->{files}{$file};
close $fh;
croak "An error occurs while extracting the tarball" if ($?);
jail_exec("gmake -C $tempdir/ref/ fact");
croak "An error occurs while making the testsuite" if ($?);
my $destdir = ( prepare_dir($year, $project_id, $rendu) )[2];
copy("$tempdir/ref/ref.ff", "$destdir/ref.ff") or croak "An error occurs while coping ref.ff: $!";
# Clean
remove_tree($tempdir);
run_moulette($project_id, $year, $rendu);
}
sub receive_std
{
my $args = shift;
my $project_id = $args->{param}{id};
my $year = $args->{param}{year};
my $rendu = $args->{param}{rendu};
my $file = $args->{param}{file};
my $login = $args->{param}{login} // "ref";
log INFO, "Receiving student tarball: $login, for $year-$project_id-$rendu";
croak "No file named '$file' given" if (!exists $args->{files}{$file});
my $tempdir = tempdir(DIR => '/data/tmp');
open my $fh, "|tar -xz -f - -C '$tempdir'";
print $fh $args->{files}{$file};
close $fh;
croak "An error occurs while extracting the tarball" if ($?);
my $destdir = ( prepare_dir($year, $project_id, $rendu) )[2];
fact_exec("package create '$tempdir' '$destdir/$login.ff'", $destdir);
croak "Cannot create $login.ff" if ($?);
chmod 0666, "$destdir/$login.ff";
# Clean
remove_tree($tempdir);
run_moulette($project_id, $year, $rendu, $login);
}
sub create_testsuite
{
my $args = shift;
my $project_id = $args->{param}{id};
my $year = $args->{param}{year};
my $rendu = $args->{param}{rendu};
my $file = $args->{param}{file};
croak "No file named '$file' given" if (!exists $args->{files}{$file});
my $tempdir = tempdir(DIR => '/data/tmp');
open my $fh, "|tar -xz -f - -C '$tempdir'";
print $fh $args->{files}{$file};
close $fh;
croak "An error occurs while extracting the tarball" if ($?);
jail_exec("gmake -C $tempdir/tests/");
croak "An error occurs while making the testsuite" if ($?);
my ($workdir, $outputdir, $destdir) = prepare_dir($year, $project_id, $rendu);
copy("$tempdir/tests/tests.ff", "$destdir/tests.ff") or croak "An error occurs while coping the testsuite: $!";
chmod 0660, "$destdir/tests.ff";
# Check if test.ft has changed
if (-f "$tempdir/tests/test.ft")
{
if (! -f "$destdir/test.ft" || compare("$tempdir/tests/test.ft", "$destdir/test.ft"))
{
log DEBUG, "test.ft has changed, UPDATE students ones.";
copy("$tempdir/tests/test.ft", "$destdir/test.ft") or croak "An error occurs while coping test.ft: $!";
chmod 0660, "$destdir/test.ft";
opendir(my $dh, $workdir) or die "Can't list files in $workdir: $!";
while (readdir($dh))
{
if (/([a-zA-Z0-9_-]+).ft$/)
{
log DEBUG, "Remove $1.ft";
unlink "$workdir/$1.ft";
}
}
closedir $dh;
}
else
{
log DEBUG, "test.ft hasn't changed, KEEP students ones.";
}
}
else {
remove_tree($tempdir);
croak "tests/test.ft not found.";
}
# Clean
remove_tree($tempdir);
run_moulette($project_id, $year, $rendu);
}
sub run_moulette
{
my $project_id = shift;
my $year = shift;
my $rendu = shift;
my @logins = @_;
my ($workdir, $outputdir, $filesdir) = prepare_dir($year, $project_id, $rendu);
if ($#logins == -1)
{
# Get all submissions
opendir(my $dh, $filesdir) or die "Can't list files in $filesdir: $!";
while (readdir($dh))
{
if (/([a-zA-Z0-9_-]+).ff$/ && -f "$filesdir/$_" && ! /^tests\.ff$/) {
push @logins, $1;
}
}
closedir $dh;
}
for my $login (@logins)
{
my $fhin;
if (-f "$filesdir/test.ft") {
open $fhin, "<", "$filesdir/test.ft" or croak "Unable to open $filesdir/test.ft: $!";
}
if ($fhin)
{
open my $fhout, ">", "$workdir/$login.ft" or croak "Unable to update $workdir/$login.ft file: $!";
while (<$fhin>)
{
$_ =~ s/#LOGIN_X/$login/g;
$_ =~ s%#GLOBAL%/data/global/%g;
$_ =~ s/#PROJECT/$filesdir/g;
$_ =~ s/#SUBMIT/$workdir/g;
$_ =~ s/#OUTPUT/$outputdir/g;
print $fhout $_;
}
close $fhin;
close $fhout;
}
copy("$filesdir/$login.ff", "$workdir/$login.ff") or croak "Cannot copy $login.ff";
next if ($login eq "ref" && ! -f "$workdir/$login.ft");
croak "Unable to find a relevant $login.ft, abort moulette start." if (! -f "$workdir/$login.ft");
log WARN, "There is no ref for $project_id $rendu" if (! -f "$filesdir/ref.ff");
log WARN, "There is no $login.ff for $project_id $rendu" if (! -f "$workdir/$login.ff");
unlink "$outputdir/$login.xml" if ( -f "$outputdir/$login.xml");
monitor_dir($outputdir, $project_id, $year, $rendu);
log INFO, "$workdir/$login.ft append to Fact manager";
fact_exec("system manager $workdir/$login.ft", $workdir);
log ERROR, "An error occurs while starting tests for $login on $year-$project_id-$rendu" if ($?);
}
}
sub moulette
{
my $args = shift;
if ($args->{unamed} == 0)
{
# Run on all submissions
run_moulette($args->{param}{id},
$args->{param}{year},
$args->{param}{rendu});
}
else
{
for (my $i = $args->{unamed}; $i > 0; $i--)
{
run_moulette($args->{param}{id},
$args->{param}{year},
$args->{param}{rendu},
$args->{param}{$i});
}
}
}
sub trace_send
{
my $path = shift;
my $filename = shift;
my $login = shift;
my $id = shift;
my $year = shift;
my $rendu = shift;
return if (! -f "$path/$filename");
my $file_content;
open my $fh, "<", "$path/$filename" or croak("Unable to read $path/$filename: $!");
$file_content .= $_ while(<$fh>);
close $fh;
log INFO, "Send trace from $path/$filename to intranet ...";
# Send trace over Gearman
Process::Client::launch(
"intradata_get",
{ "type" => "trace",
"action" => "update",
"id" => $id,
"year" => $year,
"rendu" => $rendu,
"login" => $login },
{ "$login.xml" => $file_content },
1
);
# Remove transfered trace
unlink "$path/$filename";
}
sub monitor_start
{
my $dir = shift;
my $id = shift;
my $year = shift;
my $rendu = shift;
my $fm = new Sys::Gamin;
log INFO, "Monitoring $dir";
$fm->monitor($dir);
while (1) {
my $event=$fm->next_event;
if (($event->type eq "create" || $event->type eq "change" || $event->type eq "exist") &&
$event->filename =~ /([^\/\\]+)\.xml$/ ) {
my $login = $event->filename;
$login =~ s/\.xml$//;
trace_send($dir, $event->filename, $login, $id, $year, $rendu);
}
}
monitor_traces( $fm->next_event ) while (1);
}
sub monitor_dir
{
my $dir = shift;
my $id = shift;
my $year = shift;
my $rendu = shift;
return if (exists ($monitored_dir{$dir}));
$monitored_dir{$dir} = threads->create(\&monitor_start, $dir, $id, $year, $rendu);
}
sub process_get
{
my ($given_args, $args) = @_;
my $type = $args->{param}{type} // "";
if (! exists $actions{$type}) {
log WARN, "Unknown type '$type'";
return "Unknown type '$type'.";
}
eval {
$actions{$type}($args);
};
if ($@) {
my $err = $@;
log ERROR, $err;
return $err;
}
return "Ok";
}
Process::register("moulette_get", \&process_get);

60
process/files/send_git.pl Normal file
View file

@ -0,0 +1,60 @@
#!/usr/bin/env perl
use strict;
use warnings;
use Carp;
use v5.10;
use File::Path qw(remove_tree);
use File::Temp qw/tempfile tempdir/;
use ACU::LDAP;
use ACU::Log;
use ACU::Process;
sub process
{
my ($given_args, $args) = @_;
my $year = $args->{param}{year} // LDAP::get_year();
my $project_id = $args->{param}{id};
my $rendu = $args->{param}{rendu};
my $login = $args->{param}{login};
my $rendu_for = $rendu;
if ($rendu =~ /^(ACU|YAKA)-(.*)$/) {
$rendu_for = $2;
}
my $path = $args->{param}{path} // "ssh://git\@localhost/$year/$project_id/$login.git";
my $tempdir = tempdir();
qx/git clone -b '$rendu' '$path' '$tempdir'/ or croak "$path is not a valid repository.";
croak "$path is not a valid repository." if ($?);
my $tar;
open my $fh, "tar -czf - -C '$tempdir' . |" or die ("Error during tar: " . $!);
$tar .= $_ while(<$fh>);
close $fh;
die "Unable to tar: $!" if ($?);
# Clean
remove_tree($tempdir);
return Process::Client::launch("moulette_get",
{
"type" => "std",
"id" => $project_id,
"year" => $year,
"rendu" => $rendu_for,
"login" => $login,
"file" => "rendu.tgz"
},
{
"rendu.tgz" => $tar
});
}
Process::register("send_git", \&process);

122
process/launch.sh Executable file
View file

@ -0,0 +1,122 @@
#! /bin/sh
cd $(dirname "$0")
GREP='/usr/bin/env grep -E'
SCREEN='/usr/bin/env screen'
SED='/usr/bin/env sed -E'
if [ `uname -s` = "FreeBSD" ]; then
SU="/usr/bin/env su"
else
SU='/usr/bin/env su -s /bin/sh'
fi
PERL='/usr/bin/env perl'
reset_agents()
{
echo "killall ssh-agent" | $SU intradmin
}
launch_screen()
{
CMD=$2
if [ -n "$3" ] && [ -f "$3" ]
then
TMP=`echo mktemp | $SU intradmin`
echo "ssh-agent" | $SU intradmin > "$TMP"
echo ". $TMP; ssh-add '$3'" | $SU intradmin
CMD=". $TMP; ssh-add -l; echo; $CMD"
fi
if [ "$HOSTNAME" = "ksh" ]
then
$SCREEN -S "$1" -d -m sh -c "$CMD"
else
echo "$SCREEN -S '$1' -d -m sh -c '$CMD'" | $SU intradmin
fi
if [ -f "$TMP" ]
then
sleep 1
/bin/rm "$TMP"
fi
}
if [ -z "$1" ]
then
ACTION="restart"
else
ACTION="$1"
fi
if [ -z "$2" ]
then
HOSTNAME=`/bin/hostname`
else
HOSTNAME="$2"
fi
if [ "$ACTION" = "stop" ] || [ "$ACTION" = "restart" ]
then
# Kill old liblersorf screen sessions
if [ "$HOSTNAME" = "ksh" ]
then
for i in `pgrep sh`
do
if [ "$$" != "$i" ]
then
pkill "$i"
fi
done
else
echo "$SCREEN -ls" | $SU intradmin | $GREP '[0-9]+\.lerdorf_[a-zA-Z0-9_-]+' |
while read LINE
do
SNAME=`echo $LINE | $SED "s/^[^0-9]*([0-9]+\.[^ \t]+).*$/\1/"`
echo "$SCREEN -S \"$SNAME\" -X kill" | $SU intradmin
done
fi
fi
if [ "$ACTION" = "start" ] || [ "$ACTION" = "restart" ]
then
case $HOSTNAME in
cpp)
launch_screen "lerdorf_process_exec_guantanamo" "while true; do $PERL ~/liblerdorf/process/exec/guantanamo.pl; done"
reset_agents
launch_screen "lerdorf_process_ldap_sync_ssh_keys_forge" "while true; do $PERL ~/liblerdorf/process/ldap/sync_ssh_keys_forge.pl; done" ~intradmin/.ssh/git
;;
hamano)
reset_agents
launch_screen "lerdorf_process_ldap_sync_ssh_keys_git" "while true; do $PERL ~/liblerdorf/process/ldap/sync_ssh_keys_git.pl; done" ~intradmin/.ssh/git
launch_screen "lerdorf_process_send_git" "while true; do $PERL ~/liblerdorf/process/files/send_git.pl; done" ~intradmin/.ssh/git
;;
moore)
launch_screen "lerdorf_process_ldap_check_ssh_key" "while true; do $PERL ~/liblerdorf/process/ldap/check_ssh_key.pl; done"
launch_screen "lerdorf_process_ldap_sync_ssh_keys" "while true; do $PERL ~/liblerdorf/process/ldap/sync_ssh_keys.pl; done"
launch_screen "lerdorf_process_ldap_update_group" "while true; do $PERL ~/liblerdorf/process/ldap/update_group.pl; done"
launch_screen "lerdorf_process_ldap_update_user" "while true; do $PERL ~/liblerdorf/process/ldap/update_user.pl; done"
#launch_screen "lerdorf_process_files_intradata_get" "while true; do $PERL ~/liblerdorf/process/files/intradata_get.pl; done"
;;
noyce)
launch_screen "lerdorf_process_files_intradata_get" "while true; do $PERL ~/liblerdorf/process/files/intradata_get.pl; done"
launch_screen "lerdorf_process_projects_gen_grading" "while true; do $PERL ~/liblerdorf/process/projects/gen_grading.pl; done"
launch_screen "lerdorf_process_projects_get_csv" "while true; do $PERL ~/liblerdorf/process/projects/get_csv.pl; done"
;;
ksh)
launch_screen "lerdorf_process_files_moulette_get" "while true; do $PERL ~/liblerdorf/process/files/moulette_get.pl; done"
;;
*)
echo "No process to launch for $HOSTNAME" >&2
exit 1
;;
esac
fi

View file

@ -17,8 +17,16 @@ use ACU::Log;
sub check_key($)
{
my $filename = shift;
# Check file content format
open my $fh, "<", $filename;
my $fcnt = <$fh>;
close $fh;
chomp($fcnt);
# Call ssh-keygen
if (`ssh-keygen -l -f $filename 2> /dev/null` =~ /^([0-9]+) [0-9a-f:]+ [a-zA-Z0-9\/_-]+ \(([A-Z]+)\)$/)
if ($fcnt =~ /^(ssh|ecdsa)-[a-z0-9-]+ [a-zA-Z0-9+=\/]+( .*)?$/ &&
`ssh-keygen -l -f $filename 2> /dev/null` =~ /^([0-9]+) +[0-9a-f:]+ +.+ +\(([A-Z]+)\)$/)
{
log INFO, "Receive valid key: type $2, size $1";
if ($2 eq "RSA") {

View file

@ -109,7 +109,7 @@ if ($0 =~ /^(?:.*\/)?sync_ssh_keys_(?:([a-zA-Z0-9]+)_)?([a-zA-Z0-9]+).pl$/) {
if ($service eq "git")
{
$Git::git_server = $2;
$Git::git_server = $2.".acu.epita.fr";
log INFO, "Start by syncing all users key...";

View file

@ -3,11 +3,10 @@
use v5.10.1;
use strict;
use warnings;
use File::Basename;
use Mail::Internet;
use Pod::Usage;
use lib "../../";
use ACU::Log;
use ACU::LDAP;
use ACU::Process;
@ -121,19 +120,87 @@ sub user_update($$)
my $dn = shift;
my $args = shift;
LDAP::update_attribute($ldap, $dn, "cn", $args->{param}{cn}) if ($args->{param}{cn});
LDAP::update_attribute($ldap, $dn, "cn", $args->{param}{firstname}." ".$args->{param}{lastname}) if ($args->{param}{firstname} && $args->{param}{lastname});
LDAP::update_attribute($ldap, $dn, "l", $args->{param}{l}) if ($args->{param}{l});
LDAP::update_attribute($ldap, $dn, "mail", $args->{param}{mail}) if ($args->{param}{mail});
LDAP::update_attribute($ldap, $dn, "postalAddress", $args->{param}{postalAddress}) if ($args->{param}{postalAddress});
LDAP::update_attribute($ldap, $dn, "postalCode", $args->{param}{postalCode}) if ($args->{param}{postalCode});
LDAP::update_attribute($ldap, $dn, "sn", $args->{param}{sn}) if ($args->{param}{sn});
LDAP::update_attribute($ldap, $dn, "telephoneNumber", $args->{param}{telephoneNumber}) if ($args->{param}{telephoneNumber});
LDAP::update_attribute($ldap, $dn, "strongAuthKey", $args->{param}{strongAuthKey}) if ($args->{param}{strongAuthKey});
LDAP::update_attribute($ldap, $dn, "c", $args->{param}{c}) if ($args->{param}{c});
LDAP::update_attribute($ldap, $dn, "title", $args->{param}{title}) if ($args->{param}{title});
LDAP::update_attribute($ldap, $dn, "intraTheme", $args->{param}{intraTheme}) if ($args->{param}{intraTheme});
LDAP::update_attribute($ldap, $dn, "birthdate", $args->{param}{birthdate}) if ($args->{param}{birthdate});
if ($args->{param}{cn}) {
LDAP::update_attribute($ldap, $dn, "cn", $args->{param}{cn});
} elsif ($args->{param}{firstname} && $args->{param}{lastname}) {
LDAP::update_attribute($ldap, $dn, "cn", $args->{param}{firstname}." ".$args->{param}{lastname});
}
if ($args->{param}{l}) {
LDAP::update_attribute($ldap, $dn, "l", $args->{param}{l});
} else {
LDAP::flush_attribute($ldap, $dn, "l");
}
if ($args->{param}{mail}) {
LDAP::update_attribute($ldap, $dn, "mail", $args->{param}{mail});
} else {
LDAP::flush_attribute($ldap, $dn, "mail");
}
if ($args->{param}{postalAddress}) {
LDAP::update_attribute($ldap, $dn, "postalAddress", $args->{param}{postalAddress});
} elsif ($args->{param}{postaladdress}) {
LDAP::update_attribute($ldap, $dn, "postalAddress", $args->{param}{postaladdress});
} else {
LDAP::flush_attribute($ldap, $dn, "postalAddress");
}
if ($args->{param}{postalCode}) {
LDAP::update_attribute($ldap, $dn, "postalCode", $args->{param}{postalCode});
} elsif ($args->{param}{postalcode}) {
LDAP::update_attribute($ldap, $dn, "postalCode", $args->{param}{postalcode});
} else {
LDAP::flush_attribute($ldap, $dn, "postalCode");
}
if ($args->{param}{sn}) {
LDAP::update_attribute($ldap, $dn, "sn", $args->{param}{sn});
} else {
LDAP::flush_attribute($ldap, $dn, "sn");
}
if ($args->{param}{telephoneNumber}) {
LDAP::update_attribute($ldap, $dn, "telephoneNumber", $args->{param}{telephoneNumber});
} elsif ($args->{param}{telephonenumber}) {
LDAP::update_attribute($ldap, $dn, "telephoneNumber", $args->{param}{telephonenumber});
} else {
LDAP::flush_attribute($ldap, $dn, "telephoneNumber");
}
if ($args->{param}{strongAuthKey}) {
LDAP::update_attribute($ldap, $dn, "strongAuthKey", $args->{param}{strongAuthKey});
} elsif ($args->{param}{strongauthkey}) {
LDAP::update_attribute($ldap, $dn, "strongAuthKey", $args->{param}{strongauthkey});
} else {
LDAP::flush_attribute($ldap, $dn, "strongAuthKey");
}
if ($args->{param}{c}) {
LDAP::update_attribute($ldap, $dn, "c", $args->{param}{c});
} else {
LDAP::flush_attribute($ldap, $dn, "c");
}
if ($args->{param}{title}) {
LDAP::update_attribute($ldap, $dn, "title", $args->{param}{title});
} else {
LDAP::flush_attribute($ldap, $dn, "title");
}
if ($args->{param}{intraTheme}) {
LDAP::update_attribute($ldap, $dn, "intraTheme", $args->{param}{intraTheme});
} elsif ($args->{param}{intratheme}) {
LDAP::update_attribute($ldap, $dn, "intraTheme", $args->{param}{intratheme});
} else {
LDAP::flush_attribute($ldap, $dn, "intraTheme");
}
if ($args->{param}{birthdate}) {
LDAP::update_attribute($ldap, $dn, "birthdate", $args->{param}{birthdate});
} else {
LDAP::flush_attribute($ldap, $dn, "birthdate");
}
}
sub alert_mail($$$$@)
@ -227,6 +294,9 @@ sub user_get_type($)
elsif ($type eq "sshkeys") {
return "sshPublicKey" ;
}
elsif ($type eq "descriptions") {
return "description" ;
}
elsif ($type eq "userInfos") {
return "userInfos" ;
}
@ -293,11 +363,11 @@ sub process_user
return "Ok";
}
if ($0 =~ /^update_group/) {
if (basename($0) =~ /^update_group/) {
$_get_type = \&group_get_type;
Process::register("update_group", \&process_group);
}
elsif ($0 =~ /^update_user/) {
elsif (basename($0) =~ /^update_user/) {
$_get_type = \&user_get_type;
Process::register("update_user", \&process_user);
}

View file

@ -0,0 +1,101 @@
#! /usr/bin/env perl
use v5.10.1;
use strict;
use warnings;
use Carp;
use Pod::Usage;
use Text::ParseWords;
use ACU::Defense;
use ACU::Grading;
use ACU::Log;
use ACU::LDAP;
use ACU::Process;
use ACU::Trace;
$ACU::Log::mail_error = 1;
our $basedir = "/intradata";
sub process
{
my $given_args = shift;
my @args = shellwords(${ shift() });
my $project_id = shift @args;
my $year = shift @args // LDAP::get_year;
# Project existing?
croak "Unable to find $project_id in $year" if (! -d "$basedir/$year/$project_id");
my $grade = Grading->new();
my @defenses;
if (-d "$basedir/$year/$project_id/defenses/")
{
# Create defenses groups
opendir(my $dh, "$basedir/$year/$project_id/defenses/") or croak "can't opendir $basedir/$year/$project_id/defenses/: $!";
for my $sout (grep { ( ! /^\./ ) && -f "$basedir/$year/$project_id/defenses/$_" } readdir($dh))
{
my $sid;
($sid = $sout) =~ s/\.xml$//;
push @defenses, $sid;
open my $xml, "<", "$basedir/$year/$project_id/defenses/$sout" or die $!;
binmode $xml;
my $str;
$str .= $_ while (<$xml>);
my $defense = Defense->new($str);
my $ids = $defense->getIds();
my @keys = keys %$ids;
my $def_i = $keys[0];
$def_i =~ s/^(.+)g.*$/$1/;
$ids->{$def_i.'_end_$LOGIN'} = undef;
$ids->{$def_i.'_end_group'} = undef;
$grade->create_from_ids($sid, $ids);
}
closedir $dh;
}
if (-d "$basedir/$year/$project_id/traces/")
{
# Create traces groups
opendir(my $dh, "$basedir/$year/$project_id/traces/") or croak "can't opendir $basedir/$year/$project_id/traces/: $!";
for my $dir (grep { ( ! /^\./ ) && -d "$basedir/$year/$project_id/traces/$_" } readdir($dh))
{
next if (grep { $dir eq "defense_$_" } @defenses);
my $ids = {};
opendir(my $dhm, "$basedir/$year/$project_id/traces/$dir") or croak "can't opendir $basedir/$year/$project_id/traces/$dir: $!";
for my $login (grep { ( ! /^\./ ) && -f "$basedir/$year/$project_id/traces/$dir/$_" } readdir($dhm))
{
open my $xml, "<", "$basedir/$year/$project_id/traces/$dir/$login" or die $!;
binmode $xml;
my $trace = Trace->new(join '', <$xml>);
my %tids = %{ $trace->getIds() };
for my $kid (keys %tids)
{
$ids->{ $kid } = $tids{ $kid };
}
}
$grade->create_from_ids($dir, $ids);
}
closedir $dh;
}
return $grade->toString;
}
Process::set_servers("gearmand:4730");
Process::register_no_parse("gen_grading", \&process);

109
process/projects/get_csv.pl Normal file
View file

@ -0,0 +1,109 @@
#! /usr/bin/env perl
use v5.10.1;
use strict;
use warnings;
use Carp;
use Pod::Usage;
use Text::ParseWords;
use XML::LibXML;
use ACU::Log;
use ACU::LDAP;
use ACU::Process;
$ACU::Log::mail_error = 1;
our $basedir = "/intradata";
sub process
{
my $given_args = shift;
my @args = shellwords(${ shift() });
my $project_id = shift @args;
my $year = shift @args // LDAP::get_year;
# Project existing?
croak "Unable to find $project_id in $year" if (! -d "$basedir/$year/$project_id");
my %grades;
my @headers;
my @averages;
opendir(my $dh, "$basedir/$year/$project_id/grades/") or croak "can't opendir $basedir/$year/$project_id/grades/: $!";
for my $gfile (grep { ( ! /^\./ ) && -f "$basedir/$year/$project_id/grades/$_" } readdir($dh))
{
my $login;
($login = $gfile) =~ s/\.xml$//;
open my $xml, "<", "$basedir/$year/$project_id/grades/$gfile" or die $!;
binmode $xml;
my $dom = XML::LibXML->load_xml(IO => $xml);
close $xml;
my @ugrades = @headers;
for my $grade ($dom->documentElement()->getElementsByTagName("grade"))
{
my $i;
for ($i = 0; $i <= $#ugrades; $i++)
{
if ($ugrades[$i] eq $grade->getAttribute("name"))
{
$ugrades[$i] = $grade->getAttribute("value");
$averages[$i] += $grade->getAttribute("value");
last;
}
}
if ($i > $#ugrades)
{
push @headers, $grade->getAttribute("name");
push @ugrades, $grade->getAttribute("value");
push @averages, $grade->getAttribute("value");
}
}
$grades{$login} = \@ugrades;
}
closedir $dh;
# Print CSV
my $out = "login";
foreach my $header (@headers) {
$out .= ",$header";
}
$out .= "\n";
my $nb = 0;
foreach my $login (keys %grades)
{
$nb += 1;
$out .= "$login";
my @ugrades = @{ $grades{$login} };
for my $header (@headers)
{
my $g = shift @ugrades;
$out .= ",";
if ($g && $g ne $header) {
$out .= $g;
} else {
$out .= "0";
}
}
$out .= "\n";
}
$out .= "Average";
foreach my $average (@averages)
{
$out .= ",".($average / $nb);
}
$out .= "\n";
return $out;
}
Process::set_servers("gearmand:4730");
Process::register_no_parse("get_csv", \&process);

74
process/view_log.sh Executable file
View file

@ -0,0 +1,74 @@
#! /bin/sh
cd `dirname $0`/..
UN=$1
if [ "$1" = "clean" ]
then
CMD=rm
shift
elif [ "$1" = "full" ]
then
CMD=cat
shift
elif echo "$1" | grep -e '^-' > /dev/null
then
CMD="tail -n `echo $1 | cut -d '-' -f 2-`"
shift
else
CMD="tail -n 50"
fi
DIRS="./"
if [ -d "/var/log/hooks/" ]
then
DIRS="$DIRS /var/log/hooks/"
fi
if [ $# -eq 0 ]
then
for D in $DIRS
do
for I in `find "$D" -name '*.log'`
do
/bin/echo -e "`dirname ${I#$D}`/\e[1m`basename $I`\e[0m"
done
done
else
if [ `uname -s` = "FreeBSD" ]
then
LIST=`mktemp lerdorf_log_XXXXX`
else
LIST=`mktemp`
fi
find $DIRS -name '*.log' > "$LIST"
while [ $# -gt 0 ]
do
NB=`grep "/$1" "$LIST" | wc -l`
if [ $NB = 1 ]
then
$CMD `grep "/$1" "$LIST"`
echo
elif [ $NB -gt 1 ]
then
echo "Too much matching file for '$1':"
for I in `grep "$1" "$LIST" | sed -E 's#^./##'`
do
/bin/echo -e "`dirname $I`/\e[1m`basename $I`\e[0m"
done
else
echo "Unable to find '$1' log file"
exit 1
fi
shift
done
rm -rf "$LIST";
fi

1948
utils/lpt

File diff suppressed because it is too large Load diff