jenkins-bot has submitted this change and it was merged.
Change subject: Dump should return decrypted votes
......................................................................
Dump should return decrypted votes
Bug: T145695
Change-Id: I6244e0ff576cd006d61dfec172f9dc3ab584515d
---
M includes/pages/DumpPage.php
1 file changed, 16 insertions(+), 1 deletion(-)
Approvals:
Chad: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/pages/DumpPage.php b/includes/pages/DumpPage.php
index a0465de..782fd64 100644
--- a/includes/pages/DumpPage.php
+++ b/includes/pages/DumpPage.php
@@ -63,7 +63,22 @@
if ( !$this->headersSent ) {
$this->sendHeaders();
}
- echo "<vote>" . $row->vote_record . "</vote>\n";
+ $record = $row->vote_record;
+ if ( $this->election->getCrypt() ) {
+ $status = $this->election->getCrypt()->decrypt( $record
);
+ if ( !$status->isOK() ) {
+ // Decrypt failed, e.g. invalid or absent
private key
+ // Still, return the encrypted vote
+ echo "<vote>\n<encrypted>" . $record .
"</encrypted>\n</vote>\n";
+ } else {
+ $decrypted_record = $status->value;
+ echo "<vote>\n<encrypted>" . $record .
+ "</encrypted>\n<decrypted>" .
$decrypted_record .
+ "</decrypted>\n</vote>\n";
+ }
+ } else {
+ echo "<vote>\n<decrypted>" . $record .
"</decrypted>\n</vote>\n";
+ }
}
public function sendHeaders() {
--
To view, visit https://gerrit.wikimedia.org/r/310824
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6244e0ff576cd006d61dfec172f9dc3ab584515d
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/SecurePoll
Gerrit-Branch: master
Gerrit-Owner: Huji <huji.h...@gmail.com>
Gerrit-Reviewer: Aaron Schulz <asch...@wikimedia.org>
Gerrit-Reviewer: Anomie <bjor...@wikimedia.org>
Gerrit-Reviewer: Chad <ch...@wikimedia.org>
Gerrit-Reviewer: Reedy <re...@wikimedia.org>
Gerrit-Reviewer: Tim Starling <tstarl...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
