Skip to content

Commit 8218770

Browse files
Flarum 1.6.3 awareness. Unfortunately can't tell it apart from 1.6.2
1 parent 9572df3 commit 8218770

File tree

4 files changed

+44
-7
lines changed

4 files changed

+44
-7
lines changed

app/FlarumVersion.php

+3-2
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ class FlarumVersion
3434
const V1_6_0 = "1.6.0";
3535
const V1_6_1 = "1.6.1";
3636
const V1_6_2 = "1.6.2";
37+
const V1_6_3 = "1.6.3";
3738

3839
// MD5 hash of the javascript of Flarum core, excluding the sourcemap declaration
3940
// Obtained through the GetCoreJavascriptHash command
@@ -60,7 +61,7 @@ class FlarumVersion
6061
'903356c565c82e0d3c6a44e550c425b4' => self::V1_5_0,
6162
'4135a73e3ffe1b9d0e7116a3e5bca4a3' => self::V1_6_0,
6263
'702cd2efea1b34a8d7faa0a3bfd00ffc' => self::V1_6_1,
63-
'65ca188696b18e8dae09bde8c4153c9a' => self::V1_6_2,
64+
'65ca188696b18e8dae09bde8c4153c9a' => [self::V1_6_2, self::V1_6_3],
6465
];
6566

6667
public array $adminJavascriptHashes = [
@@ -86,7 +87,7 @@ class FlarumVersion
8687
'c3f70117d274b204fba315ed6d0d74cf' => self::V1_5_0,
8788
'230a43eaea321ec606294148f5d1fd5e' => self::V1_6_0,
8889
'0db372f871bdbb3ad775b47b5ff20125' => self::V1_6_1,
89-
'57370588974a1e187c656a3497f78dee' => self::V1_6_2,
90+
'57370588974a1e187c656a3497f78dee' => [self::V1_6_2, self::V1_6_3],
9091
];
9192

9293
public static function isBeta7(array $versions): bool

app/FlarumVersionGuesser.php

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ public function guess(string $html, string $bootScript): array
2020
FlarumVersion::V1_6_0,
2121
FlarumVersion::V1_6_1,
2222
FlarumVersion::V1_6_2,
23+
FlarumVersion::V1_6_3,
2324
];
2425
}
2526

app/Report/RatingAgent.php

+37-5
Original file line numberDiff line numberDiff line change
@@ -40,21 +40,53 @@ public function rate()
4040
// If we're unsure, we won't mark vulnerable
4141
// If the list of guest versions is empty, we skip this test, this will happen for forums running a custom build
4242
if (count($versions) && count(array_diff($versions, [
43+
// I remember there was a major fix in beta 13 but can't find details
44+
// https://github.com/flarum/framework/security/advisories/GHSA-22m9-m3ww-53h3 Mentions REST
4345
FlarumVersion::BETA_7,
4446
FlarumVersion::BETA_8,
47+
48+
// I remember there was a major fix in beta 13 but can't find details
49+
// https://github.com/flarum/framework/security/advisories/GHSA-3wjh-93gr-chh6 Missing CSRF
50+
// https://github.com/flarum/framework/security/advisories/GHSA-22m9-m3ww-53h3 Mentions REST
4551
FlarumVersion::BETA_9,
4652
FlarumVersion::BETA_10,
4753
FlarumVersion::BETA_11,
4854
FlarumVersion::BETA_12,
49-
])) === 0) {
50-
return true;
51-
}
5255

53-
// https://github.com/flarum/framework/security/advisories/GHSA-7x4w-j98p-854x
54-
if (count($versions) && count(array_diff($versions, [
56+
// https://github.com/flarum/framework/security/advisories/GHSA-22m9-m3ww-53h3 Mentions REST
57+
FlarumVersion::BETA_13,
58+
FlarumVersion::BETA_14,
59+
FlarumVersion::BETA_14_1,
60+
FlarumVersion::BETA_15,
61+
FlarumVersion::BETA_16,
62+
63+
// https://github.com/flarum/framework/security/advisories/GHSA-5qjq-69w6-fg57 XSS translator
64+
// https://github.com/flarum/framework/security/advisories/GHSA-22m9-m3ww-53h3 Mentions REST
65+
FlarumVersion::V1_0_0,
66+
FlarumVersion::V1_0_1,
67+
68+
// https://github.com/flarum/framework/security/advisories/GHSA-22m9-m3ww-53h3 Mentions REST
69+
FlarumVersion::V1_0_2,
70+
FlarumVersion::V1_0_3,
71+
FlarumVersion::V1_0_4,
72+
FlarumVersion::V1_1_0,
73+
FlarumVersion::V1_1_1,
74+
FlarumVersion::V1_2_0,
75+
FlarumVersion::V1_2_1,
76+
FlarumVersion::V1_3_0,
77+
FlarumVersion::V1_3_1,
78+
FlarumVersion::V1_4_0,
79+
80+
// https://github.com/flarum/framework/security/advisories/GHSA-7x4w-j98p-854x XSS discussion title
81+
// https://github.com/flarum/framework/security/advisories/GHSA-22m9-m3ww-53h3 Mentions REST
5582
FlarumVersion::V1_5_0,
5683
FlarumVersion::V1_6_0,
5784
FlarumVersion::V1_6_1,
85+
86+
// https://github.com/flarum/framework/security/advisories/GHSA-22m9-m3ww-53h3 Mentions REST
87+
// https://github.com/flarum/framework/security/advisories/GHSA-8gcg-vwmw-rxj4 Notifications leak
88+
// https://github.com/flarum/framework/security/advisories/GHSA-hph3-hv3c-7725 First post deleted
89+
FlarumVersion::V1_6_2,
5890
])) === 0) {
5991
return true;
6092
}

tests/Unit/FlarumVersionGuesserTest.php

+3
Original file line numberDiff line numberDiff line change
@@ -540,6 +540,7 @@ function testV140Typical()
540540
FlarumVersion::V1_6_0,
541541
FlarumVersion::V1_6_1,
542542
FlarumVersion::V1_6_2,
543+
FlarumVersion::V1_6_3,
543544
], $this->guesser->guess($html, $html));
544545
}
545546

@@ -553,6 +554,7 @@ function testV150Typical()
553554
FlarumVersion::V1_6_0,
554555
FlarumVersion::V1_6_1,
555556
FlarumVersion::V1_6_2,
557+
FlarumVersion::V1_6_3,
556558
], $this->guesser->guess($html, $html));
557559
}
558560

@@ -566,6 +568,7 @@ function testV162Typical()
566568
FlarumVersion::V1_6_0,
567569
FlarumVersion::V1_6_1,
568570
FlarumVersion::V1_6_2,
571+
FlarumVersion::V1_6_3,
569572
], $this->guesser->guess($html, $html));
570573
}
571574
}

0 commit comments

Comments
 (0)