You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@vcl.apache.org by jf...@apache.org on 2019/05/29 14:38:36 UTC
[vcl] branch VCL-1087_VCL_CAS_SSO updated (05ca63a -> 4648ee1)
This is an automated email from the ASF dual-hosted git repository.
jfthomps pushed a change to branch VCL-1087_VCL_CAS_SSO
in repository https://gitbox.apache.org/repos/asf/vcl.git.
from 05ca63a VCL-1087 - This closes #5 - userlookup fixes.
add 38e25f2 VCL-1093 Added code contributed by [~junaid.ali] check to make sure VM's power is off in VMware.pm::delete_vm before attempting to unregister.
add 2b87efb VCL-1085 - Configuring VCL Website to use custom port
add 7b77766 VCL-1097 Adding .gitignore files and empty tool directories to teh project along with adding code to ignore .gitignore files when scripts are being copied and executed on the system.
add f822f8c VCL-1097 - This closes #1
add 6741fa4 fixed tabing in run_stage_scripts_on_management_node
add 0f62b8a VCL-1101 Changing chmod 755 from string to octal value
add d0150be VCL-1101 - This closes #2
add a087631 VCL-1089 - Change ping module to use Net::Ping::External
add 932d572 doap_vcl.rdf: changed repo from subversion to git
add a77c878 VCL-1079 - Virtual Hosts page references Computer Utilities
add d318bc0 Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/vcl into develop
add 4e9e37c VCL-1100 - block allocation usage graph does not work correctly for allocations with a single time slot
add 15b187f Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/vcl into develop
add de9e192 VCL-1104 - set cpu topology for libvirt VMs
add e505850 VCL-1106 - make PHP code compatible with PHP 7
add ce1e6d7 Merge branch 'VCL-1106_updates_for_php7' into develop
add 5a4735f Merge pull request #1 from apache/master
add 558403d VCL-1082 Added code to get epoc time from the database when the monitoring function is being called. This will prevent issues durring daylights saving time.
add 273018a VCL-1082 - This closes #8 - managementnode lastcheckin conversion to db epoch
add 9a0958b VCL-1095 - Move unjoining of Windows VMs from Active Directory to earlier in the deprovision process
add 2c96d3a Merge branch 'VCL-1095_move_AD_unjoin' into develop
add c92ffda VCL-1105 - Shibboleth authentication broken due to bug in getCryptKeyID
add 5743cf3 VCL-1103 - change vcldsemaphore.pid from smallint to mediumint
add c212dfd VCL-1082 - monitor_vcld.pl throws incorrect lastcheckin time exception after Daylight Savings Time Roles Back
add dade55f VCL-1082 - monitor_vcld.pl throws incorrect lastcheckin time exception after Daylight Savings Time Roles Back
add 3dffb95 VCL-1096 - Add ability to automatically mount NFS shares under Windows
add 5abdb11 VCL-1081 - UID conflict for admin user
add cc87c75 VCL-1109 - date duplicated on statistic graph labels for day after daylight saving time rolls back
add 9c7c26e VCL-1111 - statgraphcache table not correctly being used
add 07687eb VCL-1110 - expose maxinitial time for images in web UI
add ed269c3 Merge branch 'develop' of https://gitbox.apache.org/repos/asf/vcl into develop
add 6b10982 Merge branch 'develop' into VCL-1093
add d9300c1 VIM_SSH.pm: modified vm_unregister: fixed small typo 'of' -> 'off'
add 74bc60d remove extra space
add 5f72290 ignoring netbeans project files
add 576a2fa check for file existence before trying to copy it
add a242e23 updated database to hold configuration. updated front end code to add checkbox to ADDomain Edit page to save this setting to database
add 2ecb20f added managementnode code to use database hostnames if configured in database
add 5d84193 use shorter name for database field as it was causing issue with managementnode code
add ec5078b updated database with shorter name
add b39cee2 VCL-1113 - image capture for Windows system configured as domain controller fails
add 143bf04 VCL-1041 - Customer facing email notifications are ugly
add bb45324 VCL-1095 - Move unjoining of Windows VMs from Active Directory to earlier in the deprovision process
add e677172 VCL-1117 - vcld fails to set fixed IP address for Linux server reservations if management node not set to static
add b2cb0df added support for offloading SSL to loadbalancer. the vcl application will not force HTTPS when config option SSLOFFLOAD is enabled within conf.php
add 9fd87f5 VCL-1112 - SSL Offload
add eee9889 added support for offloading SSL to loadbalancer. the vcl application will not force HTTPS when config option SSLOFFLOAD is enabled within conf.php
add cf06593 Merge branch 'VCL-1112_ssl_offload' of github.com:apache/vcl into VCL-1112_ssl_offload
add aeb81d1 VCL-1086 - improve modularization of authentication
add 0eda523 VCL-1119 - wrong day submitted for future reservations made in the evening
add 80705e8 VCL-1120 - image conversion from vmdk to qcow2 always done twice
add 101b535 Merge branch 'develop' into VCL-1116_use_database_hostnames_for_ad_joined_computers
add e17dae7 VCL-1106 - make PHP code compatible with PHP 7
add df80209 Merge branch 'develop' into VCL-1116_use_database_hostnames_for_ad_joined_computers
add 0589919 VCL-1116 - use database hostnames for ad joined computers
add bc4956a vcl-install.sh: updated ARCHIVEURLPATH and SIGPATH for RCs to use https vcl-upgrade.sh: updated SIGPATH for production code and ARCHIVEURLPATH and SIGPATH for RCs to use https
add 358dffb Merge branch 'develop' of https://gitbox.apache.org/repos/asf/vcl into develop
add 0ee8921 Merge branch 'develop' of github.com:apache/vcl into develop
add 2a711bb Windows.pm: modified reboot: corrected comment about setting sshd service startup mode; added debug notify for successful setting of sshd service to manual
add 9912242 VCL-1084 - set cache mode for libvirt VMs
add 3e1bfe5 VCL-1084 - set cache mode for libvirt VMs
new 4648ee1 Merge branch 'develop' into VCL-1087_VCL_CAS_SSO
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
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(-)
create mode 100755 managementnode/bin/vclmessages.pl
create mode 100644 managementnode/tools/ESXi/Scripts/post_initial_connection/.gitignore
create mode 100644 managementnode/tools/ESXi/Scripts/post_load/.gitignore
create mode 100644 managementnode/tools/ESXi/Scripts/post_reservation/.gitignore
create mode 100644 managementnode/tools/ESXi/Scripts/post_reserve/.gitignore
create mode 100644 managementnode/tools/ESXi/Scripts/pre_capture/.gitignore
create mode 100644 managementnode/tools/ESXi/Scripts/pre_reload/.gitignore
create mode 100644 managementnode/tools/Linux/Scripts/post_initial_connection/.gitignore
create mode 100644 managementnode/tools/Linux/Scripts/post_load/.gitignore
create mode 100644 managementnode/tools/Linux/Scripts/post_reservation/.gitignore
create mode 100644 managementnode/tools/Linux/Scripts/post_reserve/.gitignore
create mode 100644 managementnode/tools/Linux/Scripts/pre_capture/.gitignore
create mode 100644 managementnode/tools/Linux/Scripts/pre_reload/.gitignore
create mode 100644 managementnode/tools/ManagementNode/Scripts/post_capture/.gitignore
create mode 100644 managementnode/tools/ManagementNode/Scripts/post_initial_connection/.gitignore
create mode 100644 managementnode/tools/ManagementNode/Scripts/post_load/.gitignore
create mode 100755 managementnode/tools/ManagementNode/Scripts/post_reservation/.gitignore
create mode 100644 managementnode/tools/ManagementNode/Scripts/post_reserve/.gitignore
create mode 100644 managementnode/tools/ManagementNode/Scripts/pre_capture/.gitignore
create mode 100755 managementnode/tools/ManagementNode/Scripts/pre_reload/.gitignore
create mode 100644 managementnode/tools/OSX/Scripts/post_initial_connection/.gitignore
create mode 100644 managementnode/tools/OSX/Scripts/post_load/.gitignore
create mode 100644 managementnode/tools/OSX/Scripts/post_reservation/.gitignore
create mode 100644 managementnode/tools/OSX/Scripts/post_reserve/.gitignore
create mode 100644 managementnode/tools/OSX/Scripts/pre_capture/.gitignore
create mode 100644 managementnode/tools/OSX/Scripts/pre_reload/.gitignore
create mode 100644 managementnode/tools/Ubuntu/Scripts/post_initial_connection/.gitignore
create mode 100644 managementnode/tools/Ubuntu/Scripts/post_load/.gitignore
create mode 100644 managementnode/tools/Ubuntu/Scripts/post_reservation/.gitignore
create mode 100644 managementnode/tools/Ubuntu/Scripts/post_reserve/.gitignore
create mode 100644 managementnode/tools/Ubuntu/Scripts/pre_capture/.gitignore
create mode 100644 managementnode/tools/Ubuntu/Scripts/pre_reload/.gitignore
create mode 100644 managementnode/tools/Windows/Drivers/.gitignore
create mode 100644 managementnode/tools/Windows/Logs/.gitignore
create mode 100644 managementnode/tools/Windows/Scripts/post_initial_connection/.gitignore
create mode 100644 managementnode/tools/Windows/Scripts/post_load/.gitignore
create mode 100644 managementnode/tools/Windows/Scripts/post_reservation/.gitignore
create mode 100644 managementnode/tools/Windows/Scripts/post_reserve/.gitignore
create mode 100644 managementnode/tools/Windows/Scripts/pre_capture/.gitignore
create mode 100644 managementnode/tools/Windows/Scripts/pre_reload/.gitignore
create mode 100644 managementnode/tools/Windows/Updates/x86/.gitignore
create mode 100644 managementnode/tools/Windows/Updates/x86_64/.gitignore
create mode 100644 managementnode/tools/Windows/Utilities/WSName/.gitignore
create mode 100644 managementnode/tools/Windows_10/Drivers/.gitignore
create mode 100644 managementnode/tools/Windows_10/Scripts/post_initial_connection/.gitignore
create mode 100644 managementnode/tools/Windows_10/Scripts/post_load/.gitignore
create mode 100644 managementnode/tools/Windows_10/Scripts/post_reservation/.gitignore
create mode 100644 managementnode/tools/Windows_10/Scripts/post_reserve/.gitignore
create mode 100644 managementnode/tools/Windows_10/Scripts/pre_capture/.gitignore
create mode 100644 managementnode/tools/Windows_10/Scripts/pre_reload/.gitignore
create mode 100644 managementnode/tools/Windows_10/Updates/.gitignore
create mode 100644 managementnode/tools/Windows_10/Utilities/.gitignore
create mode 100644 managementnode/tools/Windows_7/Drivers/.gitignore
create mode 100644 managementnode/tools/Windows_7/Scripts/post_initial_connection/.gitignore
create mode 100644 managementnode/tools/Windows_7/Scripts/post_load/.gitignore
create mode 100644 managementnode/tools/Windows_7/Scripts/post_reservation/.gitignore
create mode 100644 managementnode/tools/Windows_7/Scripts/post_reserve/.gitignore
create mode 100644 managementnode/tools/Windows_7/Scripts/pre_capture/.gitignore
create mode 100644 managementnode/tools/Windows_7/Scripts/pre_reload/.gitignore
create mode 100644 managementnode/tools/Windows_7/Updates/x86/.gitignore
create mode 100644 managementnode/tools/Windows_7/Updates/x86_64/.gitignore
create mode 100644 managementnode/tools/Windows_7/Utilities/.gitignore
create mode 100644 managementnode/tools/Windows_8/Drivers/.gitignore
create mode 100644 managementnode/tools/Windows_8/Scripts/post_initial_connection/.gitignore
create mode 100644 managementnode/tools/Windows_8/Scripts/post_load/.gitignore
create mode 100644 managementnode/tools/Windows_8/Scripts/post_reservation/.gitignore
create mode 100644 managementnode/tools/Windows_8/Scripts/post_reserve/.gitignore
create mode 100644 managementnode/tools/Windows_8/Scripts/pre_capture/.gitignore
create mode 100644 managementnode/tools/Windows_8/Scripts/pre_reload/.gitignore
create mode 100644 managementnode/tools/Windows_8/Updates/.gitignore
create mode 100644 managementnode/tools/Windows_8/Utilities/.gitignore
create mode 100644 managementnode/tools/Windows_Server_2003/Drivers/.gitignore
create mode 100644 managementnode/tools/Windows_Server_2003/Scripts/post_initial_connection/.gitignore
create mode 100644 managementnode/tools/Windows_Server_2003/Scripts/post_load/.gitignore
create mode 100644 managementnode/tools/Windows_Server_2003/Scripts/post_reservation/.gitignore
create mode 100644 managementnode/tools/Windows_Server_2003/Scripts/post_reserve/.gitignore
create mode 100644 managementnode/tools/Windows_Server_2003/Scripts/pre_capture/.gitignore
create mode 100644 managementnode/tools/Windows_Server_2003/Scripts/pre_reload/.gitignore
create mode 100644 managementnode/tools/Windows_Server_2003/Updates/x86/.gitignore
create mode 100644 managementnode/tools/Windows_Server_2003/Updates/x86_64/.gitignore
create mode 100644 managementnode/tools/Windows_Server_2003/Utilities/Sysprep/.gitignore
create mode 100644 managementnode/tools/Windows_Server_2008/Drivers/.gitignore
create mode 100644 managementnode/tools/Windows_Server_2008/Scripts/post_initial_connection/.gitignore
create mode 100644 managementnode/tools/Windows_Server_2008/Scripts/post_load/.gitignore
create mode 100644 managementnode/tools/Windows_Server_2008/Scripts/post_reservation/.gitignore
create mode 100644 managementnode/tools/Windows_Server_2008/Scripts/post_reserve/.gitignore
create mode 100644 managementnode/tools/Windows_Server_2008/Scripts/pre_capture/.gitignore
create mode 100644 managementnode/tools/Windows_Server_2008/Scripts/pre_reload/.gitignore
create mode 100644 managementnode/tools/Windows_Server_2008/Updates/x86/.gitignore
create mode 100644 managementnode/tools/Windows_Server_2008/Updates/x86_64/.gitignore
create mode 100644 managementnode/tools/Windows_Server_2008/Utilities/.gitignore
create mode 100644 managementnode/tools/Windows_Server_2012/Drivers/.gitignore
create mode 100644 managementnode/tools/Windows_Server_2012/Scripts/post_initial_connection/.gitignore
create mode 100644 managementnode/tools/Windows_Server_2012/Scripts/post_load/.gitignore
create mode 100644 managementnode/tools/Windows_Server_2012/Scripts/post_reservation/.gitignore
create mode 100644 managementnode/tools/Windows_Server_2012/Scripts/post_reserve/.gitignore
create mode 100644 managementnode/tools/Windows_Server_2012/Scripts/pre_capture/.gitignore
create mode 100644 managementnode/tools/Windows_Server_2012/Scripts/pre_reload/.gitignore
create mode 100644 managementnode/tools/Windows_Server_2012/Updates/.gitignore
create mode 100644 managementnode/tools/Windows_Server_2012/Utilities/.gitignore
create mode 100644 managementnode/tools/Windows_Server_2016/Drivers/.gitignore
create mode 100644 managementnode/tools/Windows_Server_2016/Scripts/post_initial_connection/.gitignore
create mode 100644 managementnode/tools/Windows_Server_2016/Scripts/post_load/.gitignore
create mode 100644 managementnode/tools/Windows_Server_2016/Scripts/post_reservation/.gitignore
create mode 100644 managementnode/tools/Windows_Server_2016/Scripts/post_reserve/.gitignore
create mode 100644 managementnode/tools/Windows_Server_2016/Scripts/pre_capture/.gitignore
create mode 100644 managementnode/tools/Windows_Server_2016/Scripts/pre_reload/.gitignore
create mode 100644 managementnode/tools/Windows_Server_2016/Updates/.gitignore
create mode 100644 managementnode/tools/Windows_Server_2016/Utilities/.gitignore
create mode 100644 managementnode/tools/Windows_Version_5/Drivers/.gitignore
create mode 100644 managementnode/tools/Windows_Version_5/Scripts/post_initial_connection/.gitignore
create mode 100644 managementnode/tools/Windows_Version_5/Scripts/post_load/.gitignore
create mode 100644 managementnode/tools/Windows_Version_5/Scripts/post_reservation/.gitignore
create mode 100644 managementnode/tools/Windows_Version_5/Scripts/post_reserve/.gitignore
create mode 100644 managementnode/tools/Windows_Version_5/Scripts/pre_capture/.gitignore
create mode 100644 managementnode/tools/Windows_Version_5/Scripts/pre_reload/.gitignore
create mode 100644 managementnode/tools/Windows_Version_5/Updates/x86/.gitignore
create mode 100644 managementnode/tools/Windows_Version_5/Updates/x86_64/.gitignore
create mode 100644 managementnode/tools/Windows_Version_6/Drivers/.gitignore
create mode 100644 managementnode/tools/Windows_Version_6/Scripts/post_initial_connection/.gitignore
create mode 100644 managementnode/tools/Windows_Version_6/Scripts/post_load/.gitignore
create mode 100644 managementnode/tools/Windows_Version_6/Scripts/post_reservation/.gitignore
create mode 100644 managementnode/tools/Windows_Version_6/Scripts/post_reserve/.gitignore
create mode 100644 managementnode/tools/Windows_Version_6/Scripts/pre_capture/.gitignore
create mode 100644 managementnode/tools/Windows_Version_6/Scripts/pre_reload/.gitignore
create mode 100644 managementnode/tools/Windows_Version_6/Updates/x86/.gitignore
create mode 100644 managementnode/tools/Windows_Version_6/Updates/x86_64/.gitignore
create mode 100644 managementnode/tools/Windows_Vista/Drivers/.gitignore
create mode 100644 managementnode/tools/Windows_Vista/Scripts/post_initial_connection/.gitignore
create mode 100644 managementnode/tools/Windows_Vista/Scripts/post_load/.gitignore
create mode 100644 managementnode/tools/Windows_Vista/Scripts/post_reservation/.gitignore
create mode 100644 managementnode/tools/Windows_Vista/Scripts/post_reserve/.gitignore
create mode 100644 managementnode/tools/Windows_Vista/Scripts/pre_capture/.gitignore
create mode 100644 managementnode/tools/Windows_Vista/Scripts/pre_reload/.gitignore
create mode 100644 managementnode/tools/Windows_Vista/Updates/x86/.gitignore
create mode 100644 managementnode/tools/Windows_Vista/Updates/x86_64/.gitignore
create mode 100644 managementnode/tools/Windows_XP/Drivers/.gitignore
create mode 100644 managementnode/tools/Windows_XP/Scripts/post_initial_connection/.gitignore
create mode 100644 managementnode/tools/Windows_XP/Scripts/post_load/.gitignore
create mode 100644 managementnode/tools/Windows_XP/Scripts/post_reservation/.gitignore
create mode 100644 managementnode/tools/Windows_XP/Scripts/post_reserve/.gitignore
create mode 100644 managementnode/tools/Windows_XP/Scripts/pre_capture/.gitignore
create mode 100644 managementnode/tools/Windows_XP/Scripts/pre_reload/.gitignore
create mode 100644 managementnode/tools/Windows_XP/Updates/x86/.gitignore
create mode 100644 managementnode/tools/Windows_XP/Updates/x86_64/.gitignore
create mode 100644 managementnode/tools/Windows_XP/Utilities/Sysprep/.gitignore
[vcl] 01/01: Merge branch 'develop' into VCL-1087_VCL_CAS_SSO
Posted by jf...@apache.org.
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 <jf...@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"];
}
}