This is an automated email from the ASF dual-hosted git repository. jfthomps pushed a commit to branch VCL-1087_VCL_CAS_SSO in repository https://gitbox.apache.org/repos/asf/vcl.git
commit 4648ee1a6f7e64bcbb2815edf8dde2d659ab6eba Merge: 05ca63a 3e1bfe5 Author: Josh Thompson <jftho...@ncsu.edu> AuthorDate: Wed May 29 10:37:34 2019 -0400 Merge branch 'develop' into VCL-1087_VCL_CAS_SSO managementnode/bin/install_perl_libs.pl | 1 + managementnode/bin/monitor_vcld.pl | 22 +- managementnode/bin/vclmessages.pl | 202 +++++++ managementnode/lib/VCL/DataStructure.pm | 33 +- managementnode/lib/VCL/Module/OS.pm | 14 +- managementnode/lib/VCL/Module/OS/Linux.pm | 34 +- .../lib/VCL/Module/OS/Linux/ManagementNode.pm | 7 + managementnode/lib/VCL/Module/OS/Windows.pm | 560 ++++++++++++++++-- .../lib/VCL/Module/Provisioning/VMware/VIM_SSH.pm | 6 +- .../lib/VCL/Module/Provisioning/VMware/VMware.pm | 9 +- .../VCL/Module/Provisioning/VMware/vSphere_SDK.pm | 8 + .../lib/VCL/Module/Provisioning/libvirt.pm | 32 +- .../lib/VCL/Module/Provisioning/libvirt/KVM.pm | 2 +- managementnode/lib/VCL/utils.pm | 112 ++-- .../Scripts/post_initial_connection/.gitignore | 11 + .../tools/ESXi/Scripts/post_load/.gitignore | 11 + .../tools/ESXi/Scripts/post_reservation/.gitignore | 11 + .../tools/ESXi/Scripts/post_reserve/.gitignore | 11 + .../tools/ESXi/Scripts/pre_capture/.gitignore | 11 + .../tools/ESXi/Scripts/pre_reload/.gitignore | 11 + .../Scripts/post_initial_connection/.gitignore | 11 + .../tools/Linux/Scripts/post_load/.gitignore | 11 + .../Linux/Scripts/post_reservation/.gitignore | 11 + .../tools/Linux/Scripts/post_reserve/.gitignore | 11 + .../tools/Linux/Scripts/pre_capture/.gitignore | 11 + .../tools/Linux/Scripts/pre_reload/.gitignore | 11 + .../ManagementNode/Scripts/post_capture/.gitignore | 11 + .../Scripts/post_initial_connection/.gitignore | 11 + .../ManagementNode/Scripts/post_load/.gitignore | 11 + .../Scripts/post_reservation/.gitignore | 11 + .../ManagementNode/Scripts/post_reserve/.gitignore | 11 + .../ManagementNode/Scripts/pre_capture/.gitignore | 11 + .../ManagementNode/Scripts/pre_reload/.gitignore | 11 + .../OSX/Scripts/post_initial_connection/.gitignore | 11 + .../tools/OSX/Scripts/post_load/.gitignore | 11 + .../tools/OSX/Scripts/post_reservation/.gitignore | 11 + .../tools/OSX/Scripts/post_reserve/.gitignore | 11 + .../tools/OSX/Scripts/pre_capture/.gitignore | 11 + .../tools/OSX/Scripts/pre_reload/.gitignore | 11 + .../Scripts/post_initial_connection/.gitignore | 11 + .../tools/Ubuntu/Scripts/post_load/.gitignore | 11 + .../Ubuntu/Scripts/post_reservation/.gitignore | 11 + .../tools/Ubuntu/Scripts/post_reserve/.gitignore | 11 + .../tools/Ubuntu/Scripts/pre_capture/.gitignore | 11 + .../tools/Ubuntu/Scripts/pre_reload/.gitignore | 11 + managementnode/tools/Windows/Drivers/.gitignore | 11 + managementnode/tools/Windows/Logs/.gitignore | 11 + .../Scripts/post_initial_connection/.gitignore | 11 + .../tools/Windows/Scripts/post_load/.gitignore | 11 + .../Windows/Scripts/post_reservation/.gitignore | 11 + .../tools/Windows/Scripts/post_reserve/.gitignore | 11 + .../tools/Windows/Scripts/pre_capture/.gitignore | 11 + .../tools/Windows/Scripts/pre_reload/.gitignore | 11 + .../tools/Windows/Updates/x86/.gitignore | 11 + .../tools/Windows/Updates/x86_64/.gitignore | 11 + .../tools/Windows/Utilities/WSName/.gitignore | 11 + managementnode/tools/Windows_10/Drivers/.gitignore | 11 + .../Scripts/post_initial_connection/.gitignore | 11 + .../tools/Windows_10/Scripts/post_load/.gitignore | 11 + .../Windows_10/Scripts/post_reservation/.gitignore | 11 + .../Windows_10/Scripts/post_reserve/.gitignore | 11 + .../Windows_10/Scripts/pre_capture/.gitignore | 11 + .../tools/Windows_10/Scripts/pre_reload/.gitignore | 11 + managementnode/tools/Windows_10/Updates/.gitignore | 11 + .../tools/Windows_10/Utilities/.gitignore | 11 + managementnode/tools/Windows_7/Drivers/.gitignore | 11 + .../Scripts/post_initial_connection/.gitignore | 11 + .../tools/Windows_7/Scripts/post_load/.gitignore | 11 + .../Windows_7/Scripts/post_reservation/.gitignore | 11 + .../Windows_7/Scripts/post_reserve/.gitignore | 11 + .../tools/Windows_7/Scripts/pre_capture/.gitignore | 11 + .../tools/Windows_7/Scripts/pre_reload/.gitignore | 11 + .../tools/Windows_7/Updates/x86/.gitignore | 11 + .../tools/Windows_7/Updates/x86_64/.gitignore | 11 + .../tools/Windows_7/Utilities/.gitignore | 11 + managementnode/tools/Windows_8/Drivers/.gitignore | 11 + .../Scripts/post_initial_connection/.gitignore | 11 + .../tools/Windows_8/Scripts/post_load/.gitignore | 11 + .../Windows_8/Scripts/post_reservation/.gitignore | 11 + .../Windows_8/Scripts/post_reserve/.gitignore | 11 + .../tools/Windows_8/Scripts/pre_capture/.gitignore | 11 + .../tools/Windows_8/Scripts/pre_reload/.gitignore | 11 + managementnode/tools/Windows_8/Updates/.gitignore | 11 + .../tools/Windows_8/Utilities/.gitignore | 11 + .../tools/Windows_Server_2003/Drivers/.gitignore | 11 + .../Scripts/post_initial_connection/.gitignore | 11 + .../Scripts/post_load/.gitignore | 11 + .../Scripts/post_reservation/.gitignore | 11 + .../Scripts/post_reserve/.gitignore | 11 + .../Scripts/pre_capture/.gitignore | 11 + .../Scripts/pre_reload/.gitignore | 11 + .../Windows_Server_2003/Updates/x86/.gitignore | 11 + .../Windows_Server_2003/Updates/x86_64/.gitignore | 11 + .../Utilities/Sysprep/.gitignore | 11 + .../tools/Windows_Server_2008/Drivers/.gitignore | 11 + .../Scripts/post_initial_connection/.gitignore | 11 + .../Scripts/post_load/.gitignore | 11 + .../Scripts/post_reservation/.gitignore | 11 + .../Scripts/post_reserve/.gitignore | 11 + .../Scripts/pre_capture/.gitignore | 11 + .../Scripts/pre_reload/.gitignore | 11 + .../Windows_Server_2008/Updates/x86/.gitignore | 11 + .../Windows_Server_2008/Updates/x86_64/.gitignore | 11 + .../tools/Windows_Server_2008/Utilities/.gitignore | 11 + .../tools/Windows_Server_2012/Drivers/.gitignore | 11 + .../Scripts/post_initial_connection/.gitignore | 11 + .../Scripts/post_load/.gitignore | 11 + .../Scripts/post_reservation/.gitignore | 11 + .../Scripts/post_reserve/.gitignore | 11 + .../Scripts/pre_capture/.gitignore | 11 + .../Scripts/pre_reload/.gitignore | 11 + .../tools/Windows_Server_2012/Updates/.gitignore | 11 + .../tools/Windows_Server_2012/Utilities/.gitignore | 11 + .../tools/Windows_Server_2016/Drivers/.gitignore | 11 + .../Scripts/post_initial_connection/.gitignore | 11 + .../Scripts/post_load/.gitignore | 11 + .../Scripts/post_reservation/.gitignore | 11 + .../Scripts/post_reserve/.gitignore | 11 + .../Scripts/pre_capture/.gitignore | 11 + .../Scripts/pre_reload/.gitignore | 11 + .../tools/Windows_Server_2016/Updates/.gitignore | 11 + .../tools/Windows_Server_2016/Utilities/.gitignore | 11 + .../tools/Windows_Version_5/Drivers/.gitignore | 11 + .../Scripts/post_initial_connection/.gitignore | 11 + .../Windows_Version_5/Scripts/post_load/.gitignore | 11 + .../Scripts/post_reservation/.gitignore | 11 + .../Scripts/post_reserve/.gitignore | 11 + .../Scripts/pre_capture/.gitignore | 11 + .../Scripts/pre_reload/.gitignore | 11 + .../tools/Windows_Version_5/Updates/x86/.gitignore | 11 + .../Windows_Version_5/Updates/x86_64/.gitignore | 11 + .../tools/Windows_Version_6/Drivers/.gitignore | 11 + .../Scripts/post_initial_connection/.gitignore | 11 + .../Windows_Version_6/Scripts/post_load/.gitignore | 11 + .../Scripts/post_reservation/.gitignore | 11 + .../Scripts/post_reserve/.gitignore | 11 + .../Scripts/pre_capture/.gitignore | 11 + .../Scripts/pre_reload/.gitignore | 11 + .../tools/Windows_Version_6/Updates/x86/.gitignore | 11 + .../Windows_Version_6/Updates/x86_64/.gitignore | 11 + .../tools/Windows_Vista/Drivers/.gitignore | 11 + .../Scripts/post_initial_connection/.gitignore | 11 + .../Windows_Vista/Scripts/post_load/.gitignore | 11 + .../Scripts/post_reservation/.gitignore | 11 + .../Windows_Vista/Scripts/post_reserve/.gitignore | 11 + .../Windows_Vista/Scripts/pre_capture/.gitignore | 11 + .../Windows_Vista/Scripts/pre_reload/.gitignore | 11 + .../tools/Windows_Vista/Updates/x86/.gitignore | 11 + .../tools/Windows_Vista/Updates/x86_64/.gitignore | 11 + managementnode/tools/Windows_XP/Drivers/.gitignore | 11 + .../Scripts/post_initial_connection/.gitignore | 11 + .../tools/Windows_XP/Scripts/post_load/.gitignore | 11 + .../Windows_XP/Scripts/post_reservation/.gitignore | 11 + .../Windows_XP/Scripts/post_reserve/.gitignore | 11 + .../Windows_XP/Scripts/pre_capture/.gitignore | 11 + .../tools/Windows_XP/Scripts/pre_reload/.gitignore | 11 + .../tools/Windows_XP/Updates/x86/.gitignore | 11 + .../tools/Windows_XP/Updates/x86_64/.gitignore | 11 + .../tools/Windows_XP/Utilities/Sysprep/.gitignore | 11 + mysql/update-vcl.sql | 47 +- mysql/vcl.sql | 44 +- vcl-install.sh | 4 +- vcl-upgrade.sh | 6 +- web/.gitignore | 4 + web/.ht-inc/addomain.php | 30 +- web/.ht-inc/authentication.php | 229 ++++---- web/.ht-inc/authmethods/itecsauth.php | 109 +++- web/.ht-inc/authmethods/ldapauth.php | 169 +++++- web/.ht-inc/authmethods/shibauth.php | 374 +++++++++++- web/.ht-inc/blockallocations.php | 115 ++-- web/.ht-inc/computer.php | 72 +-- web/.ht-inc/conf-default.php | 11 +- web/.ht-inc/config.php | 44 +- web/.ht-inc/dashboard.php | 32 +- web/.ht-inc/groups.php | 28 +- web/.ht-inc/help.php | 2 +- web/.ht-inc/image.php | 94 +-- web/.ht-inc/managementnode.php | 18 +- web/.ht-inc/oneclick.php | 4 +- web/.ht-inc/privileges.php | 72 +-- web/.ht-inc/requests.php | 27 +- web/.ht-inc/resource.php | 4 +- web/.ht-inc/schedule.php | 4 +- web/.ht-inc/secrets-default.php | 2 +- web/.ht-inc/serverprofiles.php | 12 +- web/.ht-inc/siteconfig.php | 91 +-- web/.ht-inc/sitemaintenance.php | 8 +- web/.ht-inc/statistics.php | 57 +- web/.ht-inc/userpreferences.php | 4 +- web/.ht-inc/utils.php | 646 ++++++++++----------- web/.ht-inc/vm.php | 28 +- web/.ht-inc/xmlrpcWrappers.php | 78 +-- web/index.php | 13 +- web/js/requests.js | 3 +- web/js/resources/addomain.js | 15 +- web/js/resources/image.js | 30 +- web/js/siteconfig.js | 17 +- web/shibauth/index.php | 263 +-------- web/testsetup.php | 17 +- web/themes/copydojocss.sh | 11 +- 200 files changed, 4102 insertions(+), 1373 deletions(-) diff --cc web/.ht-inc/utils.php index 4461ab9,662ab77..a9928eb --- a/web/.ht-inc/utils.php +++ b/web/.ht-inc/utils.php @@@ -1489,9 -1508,9 +1514,9 @@@ function getImages($includedeleted=0, $ . "u.affiliationid = a.id "; if(! $includedeleted) $query .= "AND i.deleted = 0 "; - $query .= "ORDER BY i.prettyname"; + $query .= "ORDER BY i.prettyname"; $qh = doQuery($query, 120); - while($row = mysql_fetch_assoc($qh)) { + while($row = mysqli_fetch_assoc($qh)) { if(is_null($row['maxconcurrent'])) $row['maxconcurrent'] = 0; $imagelist[$includedeleted][$row["id"]] = $row; @@@ -1515,10 -1534,10 +1540,10 @@@ $imagelist[$includedeleted][$row["id"]]["subimages"] = array(); if($allmetadata[$metaid]["subimages"]) { $query2 = "SELECT imageid " - . "FROM subimages " - . "WHERE imagemetaid = $metaid"; + . "FROM subimages " + . "WHERE imagemetaid = $metaid"; $qh2 = doQuery($query2, 101); - while($row2 = mysql_fetch_assoc($qh2)) + while($row2 = mysqli_fetch_assoc($qh2)) $imagelist[$includedeleted][$row["id"]]["subimages"][] = $row2["imageid"]; } }