Merge branch '5.0/vulnerable-passwords-page-users' into 5.0-trunk

zhendeh · Apr 12, 2023 · 49b8978 · 49b8978
2 parents 1a274d9 + 197b9a9
commit 49b8978
Showing 1 changed file with 18 additions and 1 deletion.
diff --git a/etc/upgrade/vulnerable-passwords.in b/etc/upgrade/vulnerable-passwords.in
@@ -99,7 +99,8 @@ if ($count == 0) {
 
 if ($fix) {
     print "Upgrading $count users...\n";
-    while (my $u = $users->Next) {
+    FetchNext( $users, 'init' );
+    while ( my $u = FetchNext($users) ) {
         my $stored = $u->__Value("Password");
         my $raw;
         if (length $stored == 32) {
@@ -139,3 +140,19 @@ if ($fix) {
     print "\n", "Run again with --fix to upgrade.\n";
     exit 1;
 }
+
+use constant PAGE_SIZE => 10000;
+sub FetchNext {
+    my ( $objs, $init ) = @_;
+    if ($init) {
+        $objs->RowsPerPage(PAGE_SIZE);
+        $objs->FirstPage;
+        return;
+    }
+
+    my $obj = $objs->Next;
+    return $obj if $obj;
+    $objs->RedoSearch;
+    $objs->FirstPage;
+    return $objs->Next;
+}