Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
120 changes: 113 additions & 7 deletions scanner/windows.go
Original file line number Diff line number Diff line change
Expand Up @@ -916,10 +916,10 @@ var (
build: "26200",
name: "Windows 11 Version 25H2",
},
// {
// build: "28000",
// name: "Windows 11 Version 26H1",
// },
{
build: "28000",
name: "Windows 11 Version 26H1",
},
},
"Server": {
{
Expand Down Expand Up @@ -2309,6 +2309,13 @@ var windowsReleases = map[string]map[string]updateProgram{
{revision: "8422", kb: "5065427"},
{revision: "8519", kb: "5066836"},
{revision: "8524", kb: "5070882"},
{revision: "8594", kb: "5068864"},
{revision: "8688", kb: "5071543"},
{revision: "8692", kb: "5074974"},
{revision: "8783", kb: "5073722"},
{revision: "8868", kb: "5075999"},
{revision: "8957", kb: "5078938"},
{revision: "9060", kb: "5082198"},
},
},
// https://support.microsoft.com/en-us/topic/windows-10-update-history-83aa43c0-82e0-92d8-1580-10642c9ed612
Expand Down Expand Up @@ -3157,6 +3164,16 @@ var windowsReleases = map[string]map[string]updateProgram{
{revision: "6332", kb: "5065429"},
{revision: "6396", kb: "5066198"},
{revision: "6456", kb: "5066791"},
{revision: "6466", kb: "5071959"},
{revision: "6575", kb: "5068781"},
{revision: "6691", kb: "5071546"},
{revision: "6693", kb: "5074976"},
{revision: "6809", kb: "5073724"},
{revision: "6811", kb: "5077796"},
{revision: "6812", kb: "5078129"},
{revision: "6937", kb: "5075912"},
{revision: "7058", kb: "5078885"},
{revision: "7184", kb: "5082200"},
},
},
},
Expand Down Expand Up @@ -3361,6 +3378,15 @@ var windowsReleases = map[string]map[string]updateProgram{
{revision: "5984", kb: "5065790"},
{revision: "6060", kb: "5066793"},
{revision: "6133", kb: "5067112"},
{revision: "6199", kb: "5068865"},
{revision: "6276", kb: "5070312"},
{revision: "6345", kb: "5071417"},
{revision: "6491", kb: "5073455"},
{revision: "6494", kb: "5077797"},
{revision: "6495", kb: "5078132"},
{revision: "6649", kb: "5075941"},
{revision: "6783", kb: "5078883"},
{revision: "6936", kb: "5082052"},
},
},
"26100": {
Expand Down Expand Up @@ -3397,6 +3423,21 @@ var windowsReleases = map[string]map[string]updateProgram{
{revision: "6901", kb: "5070773"},
{revision: "6905", kb: "5070881"},
{revision: "7019", kb: "5067036"},
{revision: "7171", kb: "5068861"},
{revision: "7178", kb: "5072359"},
{revision: "7309", kb: "5070311"},
{revision: "7462", kb: "5072033"},
{revision: "7623", kb: "5074109"},
{revision: "7627", kb: "5077744"},
{revision: "7628", kb: "5078127"},
{revision: "7705", kb: "5074105"},
{revision: "7840", kb: "5077181"},
{revision: "7922", kb: "5077241"},
{revision: "8037", kb: "5079473"},
{revision: "8039", kb: "5085516"},
{revision: "8116", kb: "5079391"},
{revision: "8117", kb: "5086672"},
{revision: "8246", kb: "5083769"},
},
},
"26200": {
Expand All @@ -3406,11 +3447,32 @@ var windowsReleases = map[string]map[string]updateProgram{
{revision: "6899", kb: "5066835"},
{revision: "6901", kb: "5070773"},
{revision: "7019", kb: "5067036"},
{revision: "7171", kb: "5068861"},
{revision: "7309", kb: "5070311"},
{revision: "7462", kb: "5072033"},
{revision: "7623", kb: "5074109"},
{revision: "7627", kb: "5077744"},
{revision: "7628", kb: "5078127"},
{revision: "7705", kb: "5074105"},
{revision: "7840", kb: "5077181"},
{revision: "7922", kb: "5077241"},
{revision: "8037", kb: "5079473"},
{revision: "8039", kb: "5085516"},
{revision: "8116", kb: "5079391"},
{revision: "8117", kb: "5086672"},
{revision: "8246", kb: "5083769"},
},
},
"28000": {
rollup: []windowsRelease{
{revision: "1", kb: ""},
{revision: "1575", kb: "5077179"},
{revision: "1643", kb: "5077239"},
{revision: "1719", kb: "5079466"},
{revision: "1764", kb: "5079489"},
{revision: "1836", kb: "5083768"},
},
Comment thread
MaineK00n marked this conversation as resolved.
},
// "28000": {
// rollup: []windowsRelease{},
// },
},
"Windows Server 2008": {
// https://support.microsoft.com/en-us/topic/windows-server-2008-sp2-update-history-9197740a-7430-f69f-19ff-4998a4e8b25b
Expand Down Expand Up @@ -4467,6 +4529,13 @@ var windowsReleases = map[string]map[string]updateProgram{
{revision: "8422", kb: "5065427"},
{revision: "8519", kb: "5066836"},
{revision: "8524", kb: "5070882"},
{revision: "8594", kb: "5068864"},
{revision: "8688", kb: "5071543"},
{revision: "8692", kb: "5074974"},
{revision: "8783", kb: "5073722"},
{revision: "8868", kb: "5075999"},
{revision: "8957", kb: "5078938"},
{revision: "9060", kb: "5082198"},
},
},
},
Expand Down Expand Up @@ -4792,6 +4861,15 @@ var windowsReleases = map[string]map[string]updateProgram{
{revision: "7792", kb: "5065428"},
{revision: "7919", kb: "5066586"},
{revision: "7922", kb: "5070883"},
{revision: "8027", kb: "5068791"},
{revision: "8146", kb: "5071544"},
{revision: "8148", kb: "5074975"},
{revision: "8276", kb: "5073723"},
{revision: "8280", kb: "5077795"},
{revision: "8281", kb: "5078131"},
{revision: "8389", kb: "5075904"},
{revision: "8511", kb: "5078752"},
{revision: "8644", kb: "5082123"},
},
},
},
Expand Down Expand Up @@ -5117,6 +5195,15 @@ var windowsReleases = map[string]map[string]updateProgram{
{revision: "4171", kb: "5065432"},
{revision: "4294", kb: "5066782"},
{revision: "4297", kb: "5070884"},
{revision: "4405", kb: "5068787"},
{revision: "4529", kb: "5071547"},
{revision: "4648", kb: "5073457"},
{revision: "4650", kb: "5077800"},
{revision: "4651", kb: "5078136"},
{revision: "4773", kb: "5075906"},
{revision: "4776", kb: "5082314"},
{revision: "4893", kb: "5078766"},
{revision: "5020", kb: "5082142"},
},
},
},
Expand Down Expand Up @@ -5150,6 +5237,14 @@ var windowsReleases = map[string]map[string]updateProgram{
{revision: "1849", kb: "5065425"},
{revision: "1913", kb: "5066780"},
{revision: "1916", kb: "5070879"},
{revision: "1965", kb: "5068779"},
{revision: "2025", kb: "5071542"},
{revision: "2092", kb: "5073450"},
{revision: "2096", kb: "5077792"},
{revision: "2097", kb: "5078133"},
{revision: "2149", kb: "5075897"},
{revision: "2207", kb: "5078734"},
{revision: "2274", kb: "5082060"},
},
},
},
Expand All @@ -5175,6 +5270,17 @@ var windowsReleases = map[string]map[string]updateProgram{
{revision: "6584", kb: "5065426"},
{revision: "6588", kb: "5068221"},
{revision: "6899", kb: "5066835"},
{revision: "6901", kb: "5070773"},
{revision: "6905", kb: "5070881"},
{revision: "7171", kb: "5068861"},
{revision: "7178", kb: "5072359"},
{revision: "7462", kb: "5072033"},
{revision: "32230", kb: "5073379"},
{revision: "32234", kb: "5077793"},
{revision: "32236", kb: "5078135"},
{revision: "32370", kb: "5075899"},
{revision: "32522", kb: "5078740"},
{revision: "32690", kb: "5082063"},
},
},
},
Expand Down
46 changes: 41 additions & 5 deletions scanner/windows_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -457,6 +457,20 @@ func Test_detectOSName(t *testing.T) {
},
want: "Windows 11 Version 25H2 for x64-based Systems",
},
{
name: "Windows 11 Version 26H1 for x64-based Systems",
args: osInfo{
productName: "Microsoft Windows 11 Pro",
version: "10.0",
build: "28000",
revision: "1575",
edition: "Professional",
servicePack: "",
arch: "x64-based",
installationType: "Client",
},
want: "Windows 11 Version 26H1 for x64-based Systems",
},
{
name: "Windows 11 latest release",
args: osInfo{
Expand All @@ -469,7 +483,7 @@ func Test_detectOSName(t *testing.T) {
arch: "x64-based",
installationType: "Client",
},
want: "Windows 11 Version 25H2 for x64-based Systems",
want: "Windows 11 Version 26H1 for x64-based Systems",
},
{
name: "Windows Server 2019",
Expand Down Expand Up @@ -972,7 +986,7 @@ func Test_windows_detectKBsFromKernelVersion(t *testing.T) {
},
want: models.WindowsKB{
Applied: nil,
Unapplied: []string{"5020953", "5019959", "5020030", "5021233", "5022282", "5019275", "5022834", "5022906", "5023696", "5023773", "5025221", "5025297", "5026361", "5026435", "5027215", "5027293", "5028166", "5028244", "5029244", "5029331", "5030211", "5030300", "5031356", "5031445", "5032189", "5032278", "5033372", "5034122", "5034203", "5034763", "5034843", "5035845", "5035941", "5036892", "5036979", "5037768", "5037849", "5039211", "5039299", "5040427", "5040525", "5041580", "5041582", "5043064", "5043131", "5044273", "5045594", "5046613", "5046714", "5048652", "5049981", "5050081", "5051974", "5052077", "5053606", "5053643", "5055518", "5055612", "5058379", "5061768", "5061979", "5058481", "5060533", "5063159", "5061087", "5062554", "5062649", "5063709", "5066188", "5063842", "5065429", "5066198", "5066791"},
Unapplied: []string{"5020953", "5019959", "5020030", "5021233", "5022282", "5019275", "5022834", "5022906", "5023696", "5023773", "5025221", "5025297", "5026361", "5026435", "5027215", "5027293", "5028166", "5028244", "5029244", "5029331", "5030211", "5030300", "5031356", "5031445", "5032189", "5032278", "5033372", "5034122", "5034203", "5034763", "5034843", "5035845", "5035941", "5036892", "5036979", "5037768", "5037849", "5039211", "5039299", "5040427", "5040525", "5041580", "5041582", "5043064", "5043131", "5044273", "5045594", "5046613", "5046714", "5048652", "5049981", "5050081", "5051974", "5052077", "5053606", "5053643", "5055518", "5055612", "5058379", "5061768", "5061979", "5058481", "5060533", "5063159", "5061087", "5062554", "5062649", "5063709", "5066188", "5063842", "5065429", "5066198", "5066791", "5071959", "5068781", "5071546", "5074976", "5073724", "5077796", "5078129", "5075912", "5078885", "5082200"},
},
},
{
Expand All @@ -983,7 +997,7 @@ func Test_windows_detectKBsFromKernelVersion(t *testing.T) {
},
want: models.WindowsKB{
Applied: nil,
Unapplied: []string{"5020953", "5019959", "5020030", "5021233", "5022282", "5019275", "5022834", "5022906", "5023696", "5023773", "5025221", "5025297", "5026361", "5026435", "5027215", "5027293", "5028166", "5028244", "5029244", "5029331", "5030211", "5030300", "5031356", "5031445", "5032189", "5032278", "5033372", "5034122", "5034203", "5034763", "5034843", "5035845", "5035941", "5036892", "5036979", "5037768", "5037849", "5039211", "5039299", "5040427", "5040525", "5041580", "5041582", "5043064", "5043131", "5044273", "5045594", "5046613", "5046714", "5048652", "5049981", "5050081", "5051974", "5052077", "5053606", "5053643", "5055518", "5055612", "5058379", "5061768", "5061979", "5058481", "5060533", "5063159", "5061087", "5062554", "5062649", "5063709", "5066188", "5063842", "5065429", "5066198", "5066791"},
Unapplied: []string{"5020953", "5019959", "5020030", "5021233", "5022282", "5019275", "5022834", "5022906", "5023696", "5023773", "5025221", "5025297", "5026361", "5026435", "5027215", "5027293", "5028166", "5028244", "5029244", "5029331", "5030211", "5030300", "5031356", "5031445", "5032189", "5032278", "5033372", "5034122", "5034203", "5034763", "5034843", "5035845", "5035941", "5036892", "5036979", "5037768", "5037849", "5039211", "5039299", "5040427", "5040525", "5041580", "5041582", "5043064", "5043131", "5044273", "5045594", "5046613", "5046714", "5048652", "5049981", "5050081", "5051974", "5052077", "5053606", "5053643", "5055518", "5055612", "5058379", "5061768", "5061979", "5058481", "5060533", "5063159", "5061087", "5062554", "5062649", "5063709", "5066188", "5063842", "5065429", "5066198", "5066791", "5071959", "5068781", "5071546", "5074976", "5073724", "5077796", "5078129", "5075912", "5078885", "5082200"},
},
},
{
Expand All @@ -1005,7 +1019,7 @@ func Test_windows_detectKBsFromKernelVersion(t *testing.T) {
},
want: models.WindowsKB{
Applied: []string{"5005104", "5005575", "5005619", "5006699", "5006745", "5007205", "5007254", "5008223", "5010197", "5009555", "5010796", "5009608", "5010354", "5010421", "5011497", "5011558", "5012604", "5012637", "5013944", "5015013", "5014021", "5014678", "5014665", "5015827", "5015879", "5016627", "5016693", "5017316", "5017381", "5018421", "5020436", "5018485", "5019081", "5021656", "5020032", "5021249", "5022553", "5022291", "5022842"},
Unapplied: []string{"5023705", "5025230", "5026370", "5027225", "5028171", "5029250", "5030216", "5031364", "5032198", "5033118", "5034129", "5034770", "5035857", "5037422", "5036909", "5037782", "5039227", "5041054", "5040437", "5041160", "5042881", "5044281", "5046616", "5048654", "5049983", "5051979", "5053603", "5055526", "5058920", "5059092", "5058385", "5061906", "5060526", "5062572", "5063880", "5065432", "5066782", "5070884"},
Unapplied: []string{"5023705", "5025230", "5026370", "5027225", "5028171", "5029250", "5030216", "5031364", "5032198", "5033118", "5034129", "5034770", "5035857", "5037422", "5036909", "5037782", "5039227", "5041054", "5040437", "5041160", "5042881", "5044281", "5046616", "5048654", "5049983", "5051979", "5053603", "5055526", "5058920", "5059092", "5058385", "5061906", "5060526", "5062572", "5063880", "5065432", "5066782", "5070884", "5068787", "5071547", "5073457", "5077800", "5078136", "5075906", "5082314", "5078766", "5082142"},
},
},
{
Expand All @@ -1015,7 +1029,29 @@ func Test_windows_detectKBsFromKernelVersion(t *testing.T) {
osPackages: osPackages{Kernel: models.Kernel{Version: "10.0.20348.9999"}},
},
want: models.WindowsKB{
Applied: []string{"5005104", "5005575", "5005619", "5006699", "5006745", "5007205", "5007254", "5008223", "5010197", "5009555", "5010796", "5009608", "5010354", "5010421", "5011497", "5011558", "5012604", "5012637", "5013944", "5015013", "5014021", "5014678", "5014665", "5015827", "5015879", "5016627", "5016693", "5017316", "5017381", "5018421", "5020436", "5018485", "5019081", "5021656", "5020032", "5021249", "5022553", "5022291", "5022842", "5023705", "5025230", "5026370", "5027225", "5028171", "5029250", "5030216", "5031364", "5032198", "5033118", "5034129", "5034770", "5035857", "5037422", "5036909", "5037782", "5039227", "5041054", "5040437", "5041160", "5042881", "5044281", "5046616", "5048654", "5049983", "5051979", "5053603", "5055526", "5058920", "5059092", "5058385", "5061906", "5060526", "5062572", "5063880", "5065432", "5066782", "5070884"},
Applied: []string{"5005104", "5005575", "5005619", "5006699", "5006745", "5007205", "5007254", "5008223", "5010197", "5009555", "5010796", "5009608", "5010354", "5010421", "5011497", "5011558", "5012604", "5012637", "5013944", "5015013", "5014021", "5014678", "5014665", "5015827", "5015879", "5016627", "5016693", "5017316", "5017381", "5018421", "5020436", "5018485", "5019081", "5021656", "5020032", "5021249", "5022553", "5022291", "5022842", "5023705", "5025230", "5026370", "5027225", "5028171", "5029250", "5030216", "5031364", "5032198", "5033118", "5034129", "5034770", "5035857", "5037422", "5036909", "5037782", "5039227", "5041054", "5040437", "5041160", "5042881", "5044281", "5046616", "5048654", "5049983", "5051979", "5053603", "5055526", "5058920", "5059092", "5058385", "5061906", "5060526", "5062572", "5063880", "5065432", "5066782", "5070884", "5068787", "5071547", "5073457", "5077800", "5078136", "5075906", "5082314", "5078766", "5082142"},
Unapplied: nil,
},
},
{
name: "10.0.28000.1",
base: base{
Distro: config.Distro{Release: "Windows 11 Version 26H1 for x64-based Systems"},
osPackages: osPackages{Kernel: models.Kernel{Version: "10.0.28000.1"}},
},
want: models.WindowsKB{
Applied: nil,
Unapplied: []string{"5077179", "5077239", "5079466", "5079489", "5083768"},
},
},
{
name: "10.0.28000.1836",
base: base{
Distro: config.Distro{Release: "Windows 11 Version 26H1 for x64-based Systems"},
osPackages: osPackages{Kernel: models.Kernel{Version: "10.0.28000.1836"}},
},
want: models.WindowsKB{
Applied: []string{"5077179", "5077239", "5079466", "5079489", "5083768"},
Unapplied: nil,
},
},
Expand Down
Loading