Merge pull request #1119 from Kitware/releases/3.0

Merge release branch back into master

Author: zackgalbreath

.env.example

@@ -21,6 +21,11 @@ MIX_APP_URL="${APP_URL}"
 # cdash.php
 #SLOW_PAGE_TIME=10
 
+# The label on the "user" field for the Login form, defaults to Email.
+# Consider changing this for clarity if you're authenticating against
+# something other than an email address in LDAP.
+#LOGIN_FIELD=Email
+
 # Maximum number of builds allowed per project.
 # When set to 0 projects are not limited by number of builds.
 #BUILDS_PER_PROJECT=0
@@ -76,10 +81,14 @@ MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
 # The type of LDAP server you are connecting to.
 # Valid values are activedirectory, openldap, and freeipa.
 #LDAP_PROVIDER=
+# Whether or not to log LDAP activities. Useful for debugging.
+#LDAP_LOGGING=
 
 # ldap_auth.php
 # The LDAP users attribute containing their email address ('mail' by default).
 #LDAP_EMAIL_ATTRIBUTE=
+# The LDAP users attribute used to locate your users. ('mail' by default).
+#LDAP_LOCATE_USERS_BY=
 # The LDAP users attribute used for authentication ('distinguishedname' by default).
 #LDAP_BIND_USERS_BY=
 # The LDAP attribute name that contains your users object GUID.

app/Models/Ldap/User.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Models\Ldap;
+
+use Adldap\Models\User as BaseModel;
+
+class User extends BaseModel
+{
+    /**
+     * Returns the model's GUID as is (not converted to binary).
+     *
+     * @return string|null
+     */
+    public function getConvertedGuid()
+    {
+        return $this->getObjectGuid();
+    }
+}

app/Schemas/OpenLDAP.php

@@ -12,4 +12,9 @@ public function objectGuid()
     {
         return env('LDAP_GUID', parent::objectGuid());
     }
+
+    public function userModel()
+    {
+        return \App\Models\Ldap\User::class;
+    }
 }

app/Services/TestCreator.php

@@ -116,7 +116,9 @@ public function computeCrc32()
         $crc32_input .= pdo_real_escape_string($this->testOutput);
         $crc32_input .= pdo_real_escape_string($this->testDetails);
         foreach ($this->measurements as $measurement) {
-            $crc32_input .= $measurement->Type . $measurement->Name . $measurement->Value;
+            $crc32_input .= "_" . pdo_real_escape_string($measurement->type);
+            $crc32_input .= "_" . pdo_real_escape_string($measurement->name);
+            $crc32_input .= "_" . pdo_real_escape_string($measurement->value);
         }
 
         foreach ($this->images as $image) {

app/cdash/app/Model/DynamicAnalysis.php

@@ -162,7 +162,7 @@ public function Insert()
             $uncompressed_log = '';
             $inflate_context = inflate_init(ZLIB_ENCODING_DEFLATE);
             foreach (str_split($this->Log, 1024) as $chunk) {
-                $uncompressed_log = inflate_add($inflate_context, $chunk, ZLIB_NO_FLUSH);
+                $uncompressed_log .= inflate_add($inflate_context, $chunk, ZLIB_NO_FLUSH);
                 if (strlen($uncompressed_log) >= $max_log_length) {
                     break;
                 }

app/cdash/include/ctestparser.php

@@ -76,6 +76,15 @@ function generateBackupFileName($projectname, $buildname, $sitename, $stamp,
         $filename .= $sitename_escaped . '_' . $buildname_escaped . '_' . $stamp . '_';
     }
     $filename .=  $currenttimestamp . '_' . $file . $ext;
+
+    // Make sure we don't generate a filename that's too long, otherwise
+    // fopen() will fail later.
+    $maxChars = 250;
+    $textLength = strlen($filename);
+    if ($textLength > $maxChars) {
+        $filename = substr_replace($filename, '', $maxChars/2, $textLength-$maxChars);
+    }
+
     return $filename;
 }
 

app/cdash/include/version.php

@@ -17,5 +17,5 @@
 // Current version
 $CDASH_VERSION_MAJOR = '3';
 $CDASH_VERSION_MINOR = '0';
-$CDASH_VERSION_PATCH = '2';
+$CDASH_VERSION_PATCH = '3';
 $CDASH_VERSION = $CDASH_VERSION_MAJOR . '.' . $CDASH_VERSION_MINOR . '.' . $CDASH_VERSION_PATCH;

app/cdash/public/api/v1/testDetails.php

@@ -145,7 +145,7 @@ function utf8_for_xml($string)
 // If so we should make that chart appear when they click next or previous.
 $extra_url = '';
 if (array_key_exists('graph', $_GET)) {
-    $extra_url = "&graph=" . $_GET['graph'];
+    $extra_url = "?graph=" . $_GET['graph'];
 }
 
 // Previous build

app/cdash/public/views/viewTest.html

@@ -241,7 +241,7 @@ <h3 ng-switch-default id="test-totals-indicator">
 
             <td ng-if="::cdash.project.showtesttime == 1"
                 align="center" ng-class="::test.timestatusclass">
-              <a ng-href="{{::test.detailsLink}}&graph=time"
+              <a ng-href="{{::test.detailsLink}}?graph=time"
                  ng-click="cancelAjax()">{{::test.timestatus}}</a>
             </td>
 

app/cdash/tests/CMakeLists.txt

@@ -53,6 +53,7 @@ add_laravel_test(/Unit/app/Validators/PasswordTest)
 add_laravel_test(/Feature/ConsumeSubmissionCommand)
 add_laravel_test(/Feature/CDashTest)
 add_laravel_test(/Feature/LdapAuthWithRulesTest)
+add_laravel_test(/Feature/OpenLdapAuthWithOverrides)
 add_laravel_test(/Feature/MigrateConfigCommand)
 add_laravel_test(/Feature/UserCommand)
 add_unit_test(/PHPUnitTest)
@@ -227,6 +228,9 @@ add_php_test(numericupdate)
 add_php_test(attachedfiles)
 add_php_test(subprojectorder)
 add_php_test(testimages)
+add_php_test(dynamicanalysislogs)
+add_php_test(namedmeasurements)
+add_php_test(longbuildname)
 
 add_subdirectory(ctest)