git commit: [emulab-devel] branch master updated (f60ccad)

[Leigh B. Stoller]

Branch master has been updated: 54d4eaf..f60ccad

- added a few extra checks on user input
- added GeniHRN.IsValid check
- fixed usage of DBQuoteSpecial
- a few style fixes
- changed defined to IsResponse
- added forgotten "use Experiment;"
- merged with master and fixed merge conflict
- fixed merge conflict
- restored check for authority when fed-api specifies project_name
- Merge branch 'wvdemeer/emulab-devel-fedapi-security-fixes' This merge

========================================================================

commit cc46f5027f7263397bdce132d78dd25aef5a09e0
Author: Wim Van de Meerssche <wim.vande...@intec.ugent.be>
Date: Mon Apr 4 09:53:16 2016 +0200

added a few extra checks on user input

4 2 protogeni/lib/GeniSlice.pm.in
44 7 protogeni/lib/GeniStdSA.pm.in
2 files changed, 48 insertions(+), 9 deletions(-)

http://git-public.flux.utah.edu/?p=emulab-devel.git;a=commitdiff;h=cc46f50

------------------------------------------------------------------------

commit dc1948897068fc7529af34dd121fabfad9dc546a
Author: Wim Van de Meerssche <wim.vande...@intec.ugent.be>
Date: Mon Apr 4 09:56:56 2016 +0200

added GeniHRN.IsValid check

2 0 protogeni/lib/GeniStdSA.pm.in
1 files changed, 2 insertions(+), 0 deletions(-)

http://git-public.flux.utah.edu/?p=emulab-devel.git;a=commitdiff;h=dc19488

------------------------------------------------------------------------

commit a7ceadb1b41b3d2590de7fdb68f305e7bf241483
Author: Wim Van de Meerssche <wim.vande...@intec.ugent.be>
Date: Mon Apr 4 15:56:29 2016 +0200

fixed usage of DBQuoteSpecial

3 3 protogeni/lib/GeniSlice.pm.in
1 files changed, 3 insertions(+), 3 deletions(-)

http://git-public.flux.utah.edu/?p=emulab-devel.git;a=commitdiff;h=a7ceadb

------------------------------------------------------------------------

commit d2aa4257853b80f39c8b09aef87bb5c8a3090a3c
Author: Wim Van de Meerssche <wim.vande...@intec.ugent.be>
Date: Mon Apr 4 16:11:34 2016 +0200

a few style fixes

20 6 protogeni/lib/GeniStdSA.pm.in
1 files changed, 20 insertions(+), 6 deletions(-)

http://git-public.flux.utah.edu/?p=emulab-devel.git;a=commitdiff;h=d2aa425

------------------------------------------------------------------------

commit 9cc507867ff6e80e27b4ac990b156142f68a1ba8
Author: Wim Van de Meerssche <wim.vande...@intec.ugent.be>
Date: Tue Apr 5 07:59:37 2016 +0200

changed defined to IsResponse

19 7 protogeni/lib/GeniStdSA.pm.in
1 files changed, 19 insertions(+), 7 deletions(-)

http://git-public.flux.utah.edu/?p=emulab-devel.git;a=commitdiff;h=9cc5078

------------------------------------------------------------------------

commit 6deb09d72b0fb205e81b62d18f2a812e1624c43f
Author: Wim Van de Meerssche <wim.vande...@intec.ugent.be>
Date: Mon Apr 11 11:42:20 2016 +0200

added forgotten "use Experiment;"

2 1 protogeni/lib/GeniStdSA.pm.in
1 files changed, 2 insertions(+), 1 deletions(-)

http://git-public.flux.utah.edu/?p=emulab-devel.git;a=commitdiff;h=6deb09d

------------------------------------------------------------------------

commit 609dcc2f6293862ce87d045f076700af5a14bd2e
Merge: 6deb09d e2e04dd
Author: Wim Van de Meerssche <wim.vande...@intec.ugent.be>
Date: Mon Apr 11 11:59:38 2016 +0200

merged with master and fixed merge conflict

218 0 apt/APT_Instance.pm.in
2 1 apt/cloudlab-nofed.json
2 158 apt/create_instance.in
230 12 apt/manage_instance.in
1 1 clientside/mobile/tbadb_serv
29 1 clientside/tmcc/common/libsetup.pm
3 0 clientside/tmcc/common/libtmcc.pm
1 1 clientside/tmcc/freebsd/newclient
6 0 clientside/tmcc/freebsd/slicefix
4 3 clientside/tmcc/freebsd10/netif-emulab.in
4 3 clientside/tmcc/freebsd9/netif-emulab.in
97 1 db/Node.pm.in
10 0 db/nfree.in
6 2 mobile/tbadb.in
33 2 protogeni/lib/GeniCM.pm.in
24 12 protogeni/lib/GeniCMV2.pm.in
2 1 protogeni/lib/GeniIMS.pm.in
27 0 protogeni/lib/GeniSlice.pm.in
10 0 protogeni/lib/GeniSliver.pm.in
59 23 protogeni/lib/GeniStdSA.pm.in
7 0 protogeni/lib/GeniXML.pm.in
3 0 sql/database-create.sql
2 0 sql/sitevars-create.sql
35 0 sql/updates/4/503
33 0 sql/updates/4/504
2 1 tbsetup/GNUmakefile.in
23 0 tbsetup/libossetup.pm.in
14 3 tbsetup/libvtop_test.pm.in
8 2 tbsetup/ptopgen.in
167 0 tbsetup/rflinks.in
18 3 tbsetup/tbswap.in
106 2 tmcd/tmcd.c
5 3 utils/prereserve.in
3 15 www/aptui/ajax-routines.ajax
1 1 www/aptui/dashboard.ajax
19 9 www/aptui/js/manage_profile.js
125 54 www/aptui/js/status.js
2 2 www/aptui/landing.php
4 0 www/aptui/server-ajax.php
76 0 www/aptui/status.ajax
29 0 www/aptui/template/status.html
50 6 www/currentusage.php3
60 12 www/dbdefs.php3.in
5 5 www/edit-dataset.php
2 2 www/menu.php3
26 39 www/node_defs.php

http://git-public.flux.utah.edu/?p=emulab-devel.git;a=commitdiff;h=609dcc2

------------------------------------------------------------------------

commit b91a121c1125685bedeaefceadffd7b29779a753
Merge: 609dcc2 b5f2686
Author: Wim Van de Meerssche <wim.vande...@intec.ugent.be>
Date: Mon Apr 18 08:50:51 2016 +0200

fixed merge conflict

58 1 apt/APT_Instance.pm.in
4 1 apt/apt_daemon.in
11 2 apt/create_instance.in
512 4 apt/manage_instance.in
3 0 assign/parse_top.cc
9 0 assign/score.cc
1 0 assign/virtual.h
2 2 clientside/tmcc/freebsd/rc.frisbee
2 2 clientside/tmcc/freebsd/rc.ipod
12 2 clientside/tmcc/freenas9/libfreenas.pm
32 19 clientside/tmcc/freenas9/libvnode_blockstore.pm
3 3 clientside/tmcc/linux-ms/mfs/pxewait
3 3 clientside/tmcc/linux-ms/mfs/rc.frisbee
3 3 clientside/tmcc/linux/rc.frisbee
2 1 clientside/tmcc/linux/rc.ipod
2 1 configure
2 1 configure.ac
42 32 db/Blockstore.pm
11 1 db/Brand.pm.in
37 1 db/Experiment.pm.in
8 5 db/Lease.pm.in
11 1 protogeni/lib/GeniAM.pm.in
9 0 protogeni/lib/GeniCM.pm.in
13 5 protogeni/lib/GeniCredential.pm.in
1 1 protogeni/lib/GeniIMS.pm.in
1 1 protogeni/lib/GeniStd.pm.in
52 37 protogeni/lib/GeniStdSA.pm.in
36 3 protogeni/lib/GeniXML.pm.in
15 0 sql/database-create.sql
1 0 sql/database-fill.sql
25 0 sql/updates/4/505
25 0 sql/updates/4/506
20 2 tbsetup/libvtop_test.pm.in
0 2 tmcd/tmcd.c
3 2 utils/GNUmakefile.in
223 0 utils/addrfdevice.in
188 0 utils/addrfpath.in
45 20 utils/emulabfeature.in
12 1 utils/imagevalidate.in
107 18 www/aptui/instance_defs.php
5 1 www/aptui/instantiate.ajax
55 1 www/aptui/js/dashboard.js
1 1 www/aptui/js/instantiate-new.js
69 2 www/aptui/js/show-project.js
22 3 www/aptui/js/status.js
68 1 www/aptui/js/user-dashboard.js
2 2 www/aptui/quickvm_sup.php
7 1 www/aptui/server-ajax.php
48 0 www/aptui/show-project.ajax
213 71 www/aptui/status.ajax
8 1 www/aptui/status.php
23 0 www/aptui/template/dashboard.html
20 1 www/aptui/template/instantiate-new.html
25 1 www/aptui/template/profile-list.html
1 24 www/aptui/template/show-project.html
26 0 www/aptui/template/status.html
4 0 www/aptui/template/user-dashboard.html
84 0 www/aptui/user-dashboard.ajax
4 3 www/currentusage.php3
2 1 www/dbdefs.php3.in
21 0 www/defs.php3.in
6 1 www/tbauth.php3
10 0 www/user_defs.php

http://git-public.flux.utah.edu/?p=emulab-devel.git;a=commitdiff;h=b91a121

------------------------------------------------------------------------

commit 051611742e6eb37e60d253b9ba261d9cad368d78
Author: Wim Van de Meerssche <wim.vande...@intec.ugent.be>
Date: Mon Apr 18 09:40:40 2016 +0200

restored check for authority when fed-api specifies project_name

1 16 protogeni/lib/GeniSA.pm.in
1 files changed, 1 insertions(+), 16 deletions(-)

http://git-public.flux.utah.edu/?p=emulab-devel.git;a=commitdiff;h=0516117

------------------------------------------------------------------------

commit f60ccad603ab9bf0394c4b365e2037a399b62e1c
Merge: 54d4eaf 0516117
Author: Leigh B Stoller <sto...@flux.utah.edu>
Date: Mon Apr 18 07:25:06 2016 -0600

Merge branch 'wvdemeer/emulab-devel-fedapi-security-fixes'
This merges !3 and closes #47.

1 16 protogeni/lib/GeniSA.pm.in
4 2 protogeni/lib/GeniSlice.pm.in
74 0 protogeni/lib/GeniStdSA.pm.in

http://git-public.flux.utah.edu/?p=emulab-devel.git;a=commitdiff;h=f60ccad

========================================================================

Clone via ssh: git-public.flux.utah.edu:/flux/git/emulab-devel.git
Clone read-only: git://git-public.flux.utah.edu/emulab-devel.git