[MediaWiki-commits] [Gerrit] mediawiki...SecurePoll[master]: Dump should return decrypted votes

2016-11-10 Thread jenkins-bot (Code Review) 
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 "" . $row->vote_record . "\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 "\n" . $record . 
"\n\n";
+   } else {
+   $decrypted_record = $status->value;
+   echo "\n" . $record .
+   "\n" . 
$decrypted_record .
+   "\n\n";
+   }
+   } else {
+   echo "\n" . $record . 
"\n\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 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: Tim Starling 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...SecurePoll[master]: Dump should return decrypted votes

2016-09-15 Thread Huji (Code Review) 
Huji has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/310824

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(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SecurePoll 
refs/changes/24/310824/1

diff --git a/includes/pages/DumpPage.php b/includes/pages/DumpPage.php
index a0465de..a90d333 100644
--- a/includes/pages/DumpPage.php
+++ b/includes/pages/DumpPage.php
@@ -63,7 +63,22 @@
if ( !$this->headersSent ) {
$this->sendHeaders();
}
-   echo "" . $row->vote_record . "\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 "\n" . $record . 
"\n\n";
+   } else {
+   $decrypted_record = $status->value;
+   echo "\n" . $record .
+   "\n" . 
$decrypted_record .
+   "\n\n";
+   }
+   } else {
+   echo "" . $record . "\n";
+   }
}
 
public function sendHeaders() {

-- 
To view, visit https://gerrit.wikimedia.org/r/310824
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6244e0ff576cd006d61dfec172f9dc3ab584515d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SecurePoll
Gerrit-Branch: master
Gerrit-Owner: Huji 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits