Reworked requests

The way how request data is generated has been changed to make it easier to update when new parameters will appear. This change also adds better branch predictor from build number, so now requests use correct branch for specified build number.
2018-01-13 19:59:05 +01:00
parent 6325fff8b6
commit f411e2ea6e
2 changed files with 100 additions and 15 deletions
--- a/shared/main.php
+++ b/shared/main.php
@@ -16,7 +16,7 @@ limitations under the License.
 */

 function uupApiVersion() {
-    return '1.8.2';
+    return '1.9.0';
 }

 function uupApiPrintBrand() {
--- a/shared/requests.php
+++ b/shared/requests.php
@@ -15,6 +15,73 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

+// Composes DeviceAttributes parameter needed to fetch data
+function composeDeviceAttributes($flight, $ring, $build, $arch) {
+    $branch = branchFromBuild($build);
+
+    if($ring == 'RETAIL') {
+        $flightEnabled = 0;
+    } else {
+        $flightEnabled = 1;
+    }
+
+    $attrib = array(
+        'App=WU',
+        'AppVer='.$build,
+        'AttrDataVer=30',
+        'BranchReadinessLevel=CB',
+        'CurrentBranch='.$branch,
+        'DeviceFamily=Windows.Desktop',
+        'FirmwareVersion=6.00',
+        'FlightContent='.$flight,
+        'FlightingBranchName=external',
+        'FlightRing='.$ring,
+        'Free=32to64',
+        'GStatus_RS3=2',
+        'InstallationType=Client',
+        'InstallLanguage=en-US',
+        'IsDeviceRetailDemo=0',
+        'IsFlightingEnabled='.$flightEnabled,
+        'OEMModel=Microsoft',
+        'OEMName_Uncleaned=Microsoft',
+        'OSArchitecture='.$arch,
+        'OSSkuId=48',
+        'OSUILocale=en-US',
+        'OSVersion='.$build,
+        'PonchAllow=1',
+        'ProcessorIdentifier=Intel64 Family 6 Model 142 Stepping 9',
+        'ProcessorManufacturer=GenuineIntel',
+        'TelemetryLevel=1',
+        'UpdateManagementGroup=2',
+        'UpgEx_RS3=Green',
+        'WuClientVer='.$build,
+    );
+
+    return 'E:'.implode('&amp;', $attrib);
+}
+
+// Returns the most possible branch for selected build
+function branchFromBuild($build) {
+    $build = explode('.', $build);
+    $build = $build[2];
+
+    switch($build) {
+        case 15063:
+            $branch = 'rs2_release';
+            break;
+
+        case 16299:
+            $branch = 'rs3_release';
+            break;
+
+        default:
+            $branch = 'rs_prerelease';
+            break;
+    }
+
+    return $branch;
+}
+
 // Composes POST data for gathering list of urls for download
 function composeFileGetRequest($updateId, $device, $info, $rev = 1) {
    $uuid = randStr(8).'-'.randStr(4).'-'.randStr(4).'-'.randStr(4).'-'.randStr(12);
@@ -25,15 +92,16 @@ function composeFileGetRequest($updateId, $device, $info, $rev = 1) {
    $created = gmdate(DATE_W3C, $createdTime);
    $expires = gmdate(DATE_W3C, $expiresTime);

-    $flightEnabled = 1;
-    $branch = 'rs_prerelease';
+    $branch = branchFromBuild($info['checkBuild']);

-    if($info['ring'] == 'RETAIL') {
-        $flightEnabled = 0;
-        $branch = 'rs2_release';
-    }
+    $deviceAttributes = composeDeviceAttributes(
+        $info['flight'],
+        $info['ring'],
+        $info['checkBuild'],
+        $info['arch']
+    );

-    return '<s:Envelope xmlns:a="http://www.w3.org/2005/08/addressing" xmlns:s="http://www.w3.org/2003/05/soap-envelope"><s:Header><a:Action s:mustUnderstand="1">http://www.microsoft.com/SoftwareDistribution/Server/ClientWebService/GetExtendedUpdateInfo2</a:Action><a:MessageID>urn:uuid:'.$uuid.'</a:MessageID><a:To s:mustUnderstand="1">https://fe3.delivery.mp.microsoft.com/ClientWebService/client.asmx/secured</a:To><o:Security s:mustUnderstand="1" xmlns:o="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"><Timestamp xmlns="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"><Created>'.$created.'</Created><Expires>'.$expires.'</Expires></Timestamp><wuws:WindowsUpdateTicketsToken wsu:id="ClientMSA" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:wuws="http://schemas.microsoft.com/msus/2014/10/WindowsUpdateAuthorization"><TicketType Name="MSA" Version="1.0" Policy="MBI_SSL"><Device>'.$device.'</Device></TicketType></wuws:WindowsUpdateTicketsToken></o:Security></s:Header><s:Body><GetExtendedUpdateInfo2 xmlns="http://www.microsoft.com/SoftwareDistribution/Server/ClientWebService"><updateIDs><UpdateIdentity><UpdateID>'.$updateId.'</UpdateID><RevisionNumber>'.$rev.'</RevisionNumber></UpdateIdentity></updateIDs><infoTypes><XmlUpdateFragmentType>FileUrl</XmlUpdateFragmentType><XmlUpdateFragmentType>FileDecryption</XmlUpdateFragmentType></infoTypes><deviceAttributes>E:BranchReadinessLevel=CB&amp;GStatus_RS3=2&amp;PonchAllow=1&amp;CurrentBranch='.$branch.'&amp;FlightContent='.$info['flight'].'&amp;FlightingBranchName=external&amp;FlightRing='.$info['ring'].'&amp;AttrDataVer=29&amp;InstallLanguage=en-US&amp;OSUILocale=en-US&amp;InstallationType=Client&amp;FirmwareVersion=6.00&amp;OSSkuId=48&amp;App=WU&amp;ProcessorManufacturer=GenuineIntel&amp;AppVer='.$info['checkBuild'].'&amp;UpgEx_RS3=Green&amp;OSArchitecture=AMD64&amp;UpdateManagementGroup=2&amp;IsFlightingEnabled='.$flightEnabled.'&amp;IsDeviceRetailDemo=0&amp;TelemetryLevel=1&amp;WuClientVer='.$info['checkBuild'].'&amp;Free=32to64&amp;OSVersion='.$info['checkBuild'].'&amp;DeviceFamily=Windows.Desktop&amp;</deviceAttributes></GetExtendedUpdateInfo2></s:Body></s:Envelope>';
+    return '<s:Envelope xmlns:a="http://www.w3.org/2005/08/addressing" xmlns:s="http://www.w3.org/2003/05/soap-envelope"><s:Header><a:Action s:mustUnderstand="1">http://www.microsoft.com/SoftwareDistribution/Server/ClientWebService/GetExtendedUpdateInfo2</a:Action><a:MessageID>urn:uuid:'.$uuid.'</a:MessageID><a:To s:mustUnderstand="1">https://fe3.delivery.mp.microsoft.com/ClientWebService/client.asmx/secured</a:To><o:Security s:mustUnderstand="1" xmlns:o="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"><Timestamp xmlns="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"><Created>'.$created.'</Created><Expires>'.$expires.'</Expires></Timestamp><wuws:WindowsUpdateTicketsToken wsu:id="ClientMSA" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:wuws="http://schemas.microsoft.com/msus/2014/10/WindowsUpdateAuthorization"><TicketType Name="MSA" Version="1.0" Policy="MBI_SSL"><Device>'.$device.'</Device></TicketType></wuws:WindowsUpdateTicketsToken></o:Security></s:Header><s:Body><GetExtendedUpdateInfo2 xmlns="http://www.microsoft.com/SoftwareDistribution/Server/ClientWebService"><updateIDs><UpdateIdentity><UpdateID>'.$updateId.'</UpdateID><RevisionNumber>'.$rev.'</RevisionNumber></UpdateIdentity></updateIDs><infoTypes><XmlUpdateFragmentType>FileUrl</XmlUpdateFragmentType><XmlUpdateFragmentType>FileDecryption</XmlUpdateFragmentType></infoTypes><deviceAttributes>'.$deviceAttributes.'</deviceAttributes></GetExtendedUpdateInfo2></s:Body></s:Envelope>';
 }

 // Composes POST data for fetching the latest update information from Windows Update
@@ -46,14 +114,31 @@ function composeFetchUpdRequest($device, $encData, $arch, $flight, $ring, $build
    $created = gmdate(DATE_W3C, $createdTime);
    $expires = gmdate(DATE_W3C, $expiresTime);

-    $flightEnabled = 1;
-    $branch = 'rs_prerelease';
+    $branch = branchFromBuild($build);

-    if($ring == 'RETAIL') {
-        $flightEnabled = 0;
-        $branch = 'rs2_release';
-    }
+    $products = array(
+        'Branch='.$branch,
+        'PN=Client.OS.rs2.'.$arch,
+        'PrimaryOSProduct=1',
+        'V='.$build,
+    );

-    return '<s:Envelope xmlns:a="http://www.w3.org/2005/08/addressing" xmlns:s="http://www.w3.org/2003/05/soap-envelope"><s:Header><a:Action s:mustUnderstand="1">http://www.microsoft.com/SoftwareDistribution/Server/ClientWebService/SyncUpdates</a:Action><a:MessageID>urn:uuid:'.$uuid.'</a:MessageID><a:To s:mustUnderstand="1">https://fe3.delivery.mp.microsoft.com/ClientWebService/client.asmx</a:To><o:Security s:mustUnderstand="1" xmlns:o="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"><Timestamp xmlns="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"><Created>'.$created.'</Created><Expires>'.$expires.'</Expires></Timestamp><wuws:WindowsUpdateTicketsToken wsu:id="ClientMSA" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:wuws="http://schemas.microsoft.com/msus/2014/10/WindowsUpdateAuthorization"><TicketType Name="MSA" Version="1.0" Policy="MBI_SSL"><Device>'.$device.'</Device></TicketType></wuws:WindowsUpdateTicketsToken></o:Security></s:Header><s:Body><SyncUpdates xmlns="http://www.microsoft.com/SoftwareDistribution/Server/ClientWebService"><cookie><Expiration>2045-04-07T12:38:34Z</Expiration><EncryptedData>'.$encData.'</EncryptedData></cookie><parameters><ExpressQuery>false</ExpressQuery><InstalledNonLeafUpdateIDs></InstalledNonLeafUpdateIDs><OtherCachedUpdateIDs></OtherCachedUpdateIDs><SkipSoftwareSync>false</SkipSoftwareSync><NeedTwoGroupOutOfScopeUpdates>true</NeedTwoGroupOutOfScopeUpdates><AlsoPerformRegularSync>true</AlsoPerformRegularSync><ComputerSpec/><ExtendedUpdateInfoParameters><XmlUpdateFragmentTypes><XmlUpdateFragmentType>Extended</XmlUpdateFragmentType><XmlUpdateFragmentType>LocalizedProperties</XmlUpdateFragmentType><XmlUpdateFragmentType>Eula</XmlUpdateFragmentType></XmlUpdateFragmentTypes><Locales><string>en-US</string></Locales></ExtendedUpdateInfoParameters><ClientPreferredLanguages></ClientPreferredLanguages><ProductsParameters><SyncCurrentVersionOnly>false</SyncCurrentVersionOnly><DeviceAttributes>E:BranchReadinessLevel=CB&amp;GStatus_RS3=2&amp;PonchAllow=1&amp;CurrentBranch='.$branch.'&amp;FlightContent='.$flight.'&amp;FlightingBranchName=external&amp;FlightRing='.$ring.'&amp;AttrDataVer=29&amp;InstallLanguage=en-US&amp;OSUILocale=en-US&amp;InstallationType=Client&amp;FirmwareVersion=6.00&amp;OSSkuId=48&amp;App=WU&amp;ProcessorManufacturer=GenuineIntel&amp;AppVer='.$build.'&amp;UpgEx_RS3=Green&amp;OSArchitecture=AMD64&amp;UpdateManagementGroup=2&amp;IsFlightingEnabled='.$flightEnabled.'&amp;IsDeviceRetailDemo=0&amp;TelemetryLevel=1&amp;WuClientVer='.$build.'&amp;Free=32to64&amp;OSVersion='.$build.'&amp;DeviceFamily=Windows.Desktop</DeviceAttributes><CallerAttributes>E:Interactive=1&amp;IsSeeker=1&amp;Id=UpdateOrchestrator&amp;</CallerAttributes><Products>PN=Client.OS.rs2.'.$arch.'&amp;Branch='.$branch.'&amp;PrimaryOSProduct=1&amp;V='.$build.';</Products></ProductsParameters></parameters></SyncUpdates></s:Body></s:Envelope>';
+    $callerAttrib = array(
+        'Id=UpdateOrchestrator',
+        'Interactive=1',
+        'IsSeeker=1',
+    );
+
+    $products = implode('&amp;', $products);
+    $callerAttrib = 'E:'.implode('&amp;', $callerAttrib);
+
+    $deviceAttributes = composeDeviceAttributes(
+        $flight,
+        $ring,
+        $build,
+        $arch
+    );
+
+    return '<s:Envelope xmlns:a="http://www.w3.org/2005/08/addressing" xmlns:s="http://www.w3.org/2003/05/soap-envelope"><s:Header><a:Action s:mustUnderstand="1">http://www.microsoft.com/SoftwareDistribution/Server/ClientWebService/SyncUpdates</a:Action><a:MessageID>urn:uuid:'.$uuid.'</a:MessageID><a:To s:mustUnderstand="1">https://fe3.delivery.mp.microsoft.com/ClientWebService/client.asmx</a:To><o:Security s:mustUnderstand="1" xmlns:o="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"><Timestamp xmlns="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"><Created>'.$created.'</Created><Expires>'.$expires.'</Expires></Timestamp><wuws:WindowsUpdateTicketsToken wsu:id="ClientMSA" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:wuws="http://schemas.microsoft.com/msus/2014/10/WindowsUpdateAuthorization"><TicketType Name="MSA" Version="1.0" Policy="MBI_SSL"><Device>'.$device.'</Device></TicketType></wuws:WindowsUpdateTicketsToken></o:Security></s:Header><s:Body><SyncUpdates xmlns="http://www.microsoft.com/SoftwareDistribution/Server/ClientWebService"><cookie><Expiration>2045-04-07T12:38:34Z</Expiration><EncryptedData>'.$encData.'</EncryptedData></cookie><parameters><ExpressQuery>false</ExpressQuery><InstalledNonLeafUpdateIDs></InstalledNonLeafUpdateIDs><OtherCachedUpdateIDs></OtherCachedUpdateIDs><SkipSoftwareSync>false</SkipSoftwareSync><NeedTwoGroupOutOfScopeUpdates>true</NeedTwoGroupOutOfScopeUpdates><AlsoPerformRegularSync>true</AlsoPerformRegularSync><ComputerSpec/><ExtendedUpdateInfoParameters><XmlUpdateFragmentTypes><XmlUpdateFragmentType>Extended</XmlUpdateFragmentType><XmlUpdateFragmentType>LocalizedProperties</XmlUpdateFragmentType><XmlUpdateFragmentType>Eula</XmlUpdateFragmentType></XmlUpdateFragmentTypes><Locales><string>en-US</string></Locales></ExtendedUpdateInfoParameters><ClientPreferredLanguages></ClientPreferredLanguages><ProductsParameters><SyncCurrentVersionOnly>false</SyncCurrentVersionOnly><DeviceAttributes>'.$deviceAttributes.'</DeviceAttributes><CallerAttributes>'.$callerAttrib.'</CallerAttributes><Products>'.$products.'</Products></ProductsParameters></parameters></SyncUpdates></s:Body></s:Envelope>';
 }
 ?>