Add Windows 11 to update names

Reviewed-on: #1

fetchupd.php

@@ -50,8 +50,12 @@ function uupApiPrivateGetLatestBuild() {
     return $build;
 }
 
-function uupApiPrivateGetAcceptableBranches() {
+function uupApiPrivateIsAcceptableBranch($branch) {
-    return [
+    if(!uupApiConfigIsTrue('production_mode')) {
+        return true;
+    }
+
+    $branches = [
         'auto',
         'rs2_release',
         'rs3_release',
@@ -66,8 +70,12 @@ function uupApiPrivateGetAcceptableBranches() {
         'ni_release',
         'zn_release',
         'ge_release',
+        'br_release',
+        'ge_prerelease',
         'rs_prerelease',
     ];
+
+    return in_array($branch, $branches);
 }
 
 function uupApiPrivateNormalizeFetchParams($params) {
@@ -173,7 +181,7 @@ function uupFetchUpd2($params, $cacheRequests = 0) {
         return array('error' => 'ILLEGAL_MINOR');
     }
 
-    if(!in_array($branch, uupApiPrivateGetAcceptableBranches()))
+    if(!uupApiPrivateIsAcceptableBranch($branch))
         $branch = 'auto';
 
     if($ring == 'DEV') $ring = 'WIF';
@@ -295,6 +303,15 @@ function parseFetchUpdate($updateInfo, $out, $arch, $ring, $flight, $build, $sku
         $foundBuild = @$info[3];
     }
 
+    $isNet = 0;
+    if(strpos($foundArch, 'netfx') !== false) {
+        $isNet = 1;
+        preg_match('/ProductReleaseInstalled Name\=".*\.(.*?)\.(.*?)" Version\=".*\.\d{5}\.(.*?)"/', $updateInfo, $info);
+        $foundType = @strtolower($info[1]);
+        $foundArch = @strtolower($info[2]);
+        $foundBuild = @$info[3];
+    }
+
     $updateTitle = preg_grep('/<Title>.*<\/Title>/', $updateMeta);
     sort($updateTitle);
 
@@ -312,10 +329,15 @@ function parseFetchUpdate($updateInfo, $out, $arch, $ring, $flight, $build, $sku
         $updateTitle = preg_replace('/ for .{3,5}-based/i', ' for', $updateTitle);
 
     $isCumulativeUpdate = 0;
-    if(preg_match('/\d{4}-\d{2}.+Update|Cumulative Update|Microsoft Edge|Windows Feature Experience Pack|Cumulative security Hotpatch/i', $updateTitle)) {
+    if(preg_match('/\d{4}-\d{2}.+Update|(Cumulative|Security|Preview) Update|Microsoft Edge|Windows Feature Experience Pack|Cumulative security Hotpatch/i', $updateTitle)) {
         $isCumulativeUpdate = 1;
+
+        if($isNet) {
+            $updateTitle = preg_replace("/3.5 and 4.8.1 |3.5 and 4.8 | for $foundArch| for x64| \(KB.*?\)/i", '', $updateTitle);
+        } else {
             $updateTitle = preg_replace('/ for .{3,5}-based systems| \(KB.*?\)/i', '', $updateTitle);
         }
+    }
 
     $updateTitle = preg_replace("/ ?\d{4}-\d{2}\D ?| ?$foundArch ?| ?x64 ?/i", '', $updateTitle);
 
@@ -324,6 +346,11 @@ function parseFetchUpdate($updateInfo, $out, $arch, $ring, $flight, $build, $sku
         $updateTitle = str_replace('Windows 11', 'Windows Server', $updateTitle);
     }
 
+    if(preg_match('/Windows 1\d|Server|Azure Stack HCI/i', $updateTitle) !== 1) {
+        $osName = $foundType != 'server' ? 'Windows 11' : 'Microsoft server operating system';
+        $updateTitle = str_replace('Update', "Update for $osName", $updateTitle);
+    }
+
     if($sku == 406)
         $updateTitle = str_replace('Microsoft server operating system', 'Azure Stack HCI', $updateTitle);
 

shared/cache.php

@@ -35,6 +35,10 @@ class UupDumpCache {
     }
 
     public function get() {
+        if(!uupApiConfigIsTrue('production_mode')) {
+            return false;
+        }
+
         $cacheFile = $this->cacheFile;
 
         if(!file_exists($cacheFile)) {
@@ -58,6 +62,10 @@ class UupDumpCache {
     }
 
     public function put($content, $validity) {
+        if(!uupApiConfigIsTrue('production_mode')) {
+            return false;
+        }
+
         $cacheFile = $this->cacheFile;
         $expires = $validity ? time() + $validity : false;
 

shared/fileinfo.php

@@ -31,6 +31,9 @@ function uupApiGetFileinfoDirs() {
 }
 
 function uupApiGetFileinfoName($updateId, $meta = false) {
+    if(!uupApiCheckUpdateId($updateId))
+        return null;
+
     $fileName = $updateId.'.json';
     $dirs = uupApiGetFileinfoDirs();
 
@@ -41,7 +44,12 @@ function uupApiGetFileinfoName($updateId, $meta = false) {
 }
 
 function uupApiFileInfoExists($updateId) {
-    return file_exists(uupApiGetFileinfoName($updateId));
+    $name = uupApiGetFileinfoName($updateId);
+
+    if($name === null)
+        return false;
+
+    return file_exists($name);
 }
 
 function uupApiWriteFileinfoMeta($updateId, $info) {
@@ -49,12 +57,19 @@ function uupApiWriteFileinfoMeta($updateId, $info) {
         unset($info['files']);
 
     $file = uupApiGetFileinfoName($updateId, true);
+
+    if($file === null)
+        return false;
+
     return uupApiWriteJson($file, $info);
 }
 
 function uupApiWriteFileinfo($updateId, $info) {
     $file = uupApiGetFileinfoName($updateId);
 
+    if($file === null)
+        return false;
+
     if(uupApiWriteJson($file, $info) === false)
         return false;
 
@@ -64,10 +79,14 @@ function uupApiWriteFileinfo($updateId, $info) {
 function uupApiReadFileinfoMeta($updateId) {
     $file = uupApiGetFileinfoName($updateId, true);
 
+    if($file === null)
+        return false;
+
     if(file_exists($file))
         return uupApiReadJson($file);
 
     $info = uupApiReadFileinfo($updateId, false);
+
     if($info === false)
         return false;
 
@@ -88,6 +107,10 @@ function uupApiReadFileinfo($updateId, $meta = false) {
         return uupApiReadFileinfoMeta($updateId);
 
     $file = uupApiGetFileinfoName($updateId);
+
+    if($file === null)
+        return false;
+
     $info = uupApiReadJson($file);
 
     return $info;

shared/main.php

@@ -16,7 +16,7 @@ limitations under the License.
 */
 
 function uupApiVersion() {
-    return '1.47.3';
+    return "I can't be bothered to update the version; use commit hash.";
 }
 
 require_once dirname(__FILE__).'/auths.php';

shared/packs.php

@@ -16,6 +16,7 @@ limitations under the License.
 */
 
 require_once dirname(__FILE__).'/../listid.php';
+require_once dirname(__FILE__).'/utils.php';
 
 function uupGetInfoTexts() {
     $fancyLangNames = array(
@@ -204,11 +205,19 @@ function uupGetInfoTexts() {
 }
 
 function uupApiGetPacks($updateId) {
-    if(empty($updateId)) return [];
+    if(empty($updateId)) 
-    if(!file_exists('packs/'.$updateId.'.json.gz')) return [];
+        return [];
+
+    if(!uupApiCheckUpdateId($updateId))
+        return [];
+
+    if(!file_exists('packs/'.$updateId.'.json.gz')) 
+        return [];
 
     $genPack = @gzdecode(@file_get_contents('packs/'.$updateId.'.json.gz'));
-    if(empty($genPack)) return [];
+
+    if(empty($genPack)) 
+        return [];
 
     $genPack = json_decode($genPack, 1);
     return $genPack;

shared/requests.php

@@ -33,12 +33,14 @@ function composeDeviceAttributes($flight, $ring, $build, $arch, $sku, $type, $fl
 
     $dvcFamily = 'Windows.Desktop';
     $insType = 'Client';
+    $prodType = 'WinNT';
     if($sku == 119) {
         $dvcFamily = 'Windows.Team';
     }
     if(uupApiIsServer($sku)) {
         $dvcFamily = 'Windows.Server';
         $insType = 'Server';
+        $prodType = 'ServerNT';
         $blockUpgrades = 1;
     }
     /*/ Hololens
@@ -114,7 +116,7 @@ function composeDeviceAttributes($flight, $ring, $build, $arch, $sku, $type, $fl
     $attrib = array(
         'App=WU_OS',
         'AppVer='.$build,
-        'AttrDataVer=247',
+        'AttrDataVer=331',
         'AllowInPlaceUpgrade=1',
         'AllowOptionalContent=1',
         'AllowUpgradesWithUnsupportedTPMOrCPU=1',
@@ -122,6 +124,9 @@ function composeDeviceAttributes($flight, $ring, $build, $arch, $sku, $type, $fl
         'BranchReadinessLevel=CB',
         'CIOptin=1',
         'CurrentBranch='.$branch,
+        'DataExpDateEpoch_GE25H2='.(time()+82800),
+        'DataExpDateEpoch_GE24H2='.(time()+82800),
+        'DataExpDateEpoch_GE24H2Setup='.(time()+82800),
         'DataExpDateEpoch_CU23H2='.(time()+82800),
         'DataExpDateEpoch_CU23H2Setup='.(time()+82800),
         'DataExpDateEpoch_NI22H2='.(time()+82800),
@@ -144,13 +149,16 @@ function composeDeviceAttributes($flight, $ring, $build, $arch, $sku, $type, $fl
         //'FlightContent='.$fltContent,
         'FlightRing='.$fltRing,
         'Free=gt64',
+        'GStatus_GE25H2=2',
+        'GStatus_GE24H2=2',
+        'GStatus_GE24H2Setup=2',
         'GStatus_CU23H2=2',
         'GStatus_CU23H2Setup=2',
+        'GStatus_NI23H2=2',
         'GStatus_NI22H2=2',
         'GStatus_NI22H2Setup=2',
         'GStatus_CO21H2=2',
         'GStatus_CO21H2Setup=2',
-        'GStatus_23H2=2',
         'GStatus_22H2=2',
         'GStatus_21H2=2',
         'GStatus_21H1=2',
@@ -182,18 +190,21 @@ function composeDeviceAttributes($flight, $ring, $build, $arch, $sku, $type, $fl
         'ProcessorIdentifier=Intel64 Family 6 Model 186 Stepping 3',
         'ProcessorManufacturer=GenuineIntel',
         'ProcessorModel=13th Gen Intel(R) Core(TM) i7-1355U',
+        'ProductType='.$prodType,
         'ReleaseType='.$type,
         'SdbVer_20H1=2000000000',
         'SdbVer_19H1=2000000000',
         'SecureBootCapable=1',
         'TelemetryLevel=3',
+        'TimestampEpochString_GE24H2='.(time()-3600),
+        'TimestampEpochString_GE24H2Setup='.(time()-3600),
         'TimestampEpochString_CU23H2='.(time()-3600),
         'TimestampEpochString_CU23H2Setup='.(time()-3600),
+        'TimestampEpochString_NI23H2='.(time()-3600),
         'TimestampEpochString_NI22H2='.(time()-3600),
         'TimestampEpochString_NI22H2Setup='.(time()-3600),
         'TimestampEpochString_CO21H2='.(time()-3600),
         'TimestampEpochString_CO21H2Setup='.(time()-3600),
-        'TimestampEpochString_23H2='.(time()-3600),
         'TimestampEpochString_22H2='.(time()-3600),
         'TimestampEpochString_21H2='.(time()-3600),
         'TimestampEpochString_21H1='.(time()-3600),
@@ -202,6 +213,7 @@ function composeDeviceAttributes($flight, $ring, $build, $arch, $sku, $type, $fl
         'TPMVersion=2',
         'UpdateManagementGroup=2',
         'UpdateOfferedDays=0',
+        'UpgEx_GE25H2=Green',
         'UpgEx_GE24H2Setup=Green',
         'UpgEx_GE24H2=Green',
         'UpgEx_CU23H2=Green',
@@ -220,6 +232,11 @@ function composeDeviceAttributes($flight, $ring, $build, $arch, $sku, $type, $fl
         'UserInPlaceUpgrade=1',
         'VBSState=2',
         'Version_RS5=2000000000',
+        'Win10CommercialAzureESUEligible=1',
+        'Win10CommercialKeybasedESUEligible=1',
+        'Win10CommercialW365ESUEligible=1',
+        'Win10ConsumerESUStatus=3',
+        'Win10ConsumerESUAY=9',
         'WuClientVer='.$build,
     );
 
@@ -289,6 +306,7 @@ function branchFromBuild($build) {
 
         case 22621:
         case 22631:
+        case 22635:
             $branch = 'ni_release';
             break;
 
@@ -297,9 +315,15 @@ function branchFromBuild($build) {
             break;
 
         case 26100:
+        case 26120:
+        case 26200:
             $branch = 'ge_release';
             break;
 
+        case 28000:
+            $branch = 'br_release';
+            break;
+
         default:
             $branch = 'rs_prerelease';
             break;
@@ -441,7 +465,7 @@ function composeFetchUpdRequest($arch, $flight, $ring, $build, $sku = 48, $type
         $products[] = "PN=$mainProduct.$currArch&Branch=$branch&PrimaryOSProduct=1&Repairable=1&V=$build&ReofferUpdate=1";
         $products[] = "PN=Adobe.Flash.$currArch&Repairable=1&V=0.0.0.0";
         $products[] = "PN=Microsoft.Edge.Stable.$currArch&Repairable=1&V=0.0.0.0";
-        $products[] = "PN=Microsoft.NETFX.$currArch&V=2018.12.2.0";
+        $products[] = "PN=Microsoft.NETFX.$currArch&V=0.0.0.0";
         $products[] = "PN=Windows.Autopilot.$currArch&Repairable=1&V=0.0.0.0";
         $products[] = "PN=Windows.AutopilotOOBE.$currArch&Repairable=1&V=0.0.0.0";
         $products[] = "PN=Windows.Appraiser.$currArch&Repairable=1&V=$build";

shared/utils.php

@@ -19,7 +19,7 @@ function uupApiPrintBrand() {
     global $uupApiBrandPrinted;
 
     if(!isset($uupApiBrandPrinted)) {
-        consoleLogger('UUP dump API v'.uupApiVersion());
+        consoleLogger('UUP dump API');
         $uupApiBrandPrinted = 1;
     }
 }
@@ -64,8 +64,12 @@ function sendWuPostRequestInternal($url, $postData, $saveCookie = true) {
     curl_setopt($req, CURLOPT_RETURNTRANSFER, 1);
     curl_setopt($req, CURLOPT_ENCODING, '');
     curl_setopt($req, CURLOPT_POSTFIELDS, $postData);
+
+    if(uupApiConfigIsTrue('production_mode')) { 
         curl_setopt($req, CURLOPT_CONNECTTIMEOUT, 5);
         curl_setopt($req, CURLOPT_TIMEOUT, 15);
+    }
+
     curl_setopt($req, CURLOPT_SSL_VERIFYPEER, 0);
     curl_setopt($req, CURLOPT_HTTPHEADER, array(
         'User-Agent: Windows-Update-Agent/10.0.10011.16384 Client-Protocol/2.50',