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

2017-06-09 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/354193 )

Change subject: Revert "Dump should return decrypted votes"
..


Revert "Dump should return decrypted votes"

For large elections the decryption takes too long (same reason tally page 
doesn't work) and prohibits use of the dump page because of timeout. 

This reverts commit d2eac8c31231136e8df57a30f88ff75d7231f102.

Change-Id: Ic0c145ac87074fe7c38331d6a5add690546e20b6
---
M includes/pages/DumpPage.php
1 file changed, 1 insertion(+), 16 deletions(-)

Approvals:
  Huji: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/pages/DumpPage.php b/includes/pages/DumpPage.php
index 5b0261c..71cb1ef 100644
--- a/includes/pages/DumpPage.php
+++ b/includes/pages/DumpPage.php
@@ -58,22 +58,7 @@
if ( !$this->headersSent ) {
$this->sendHeaders();
}
-   $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";
-   }
+   echo "" . $row->vote_record . "\n";
}
 
public function sendHeaders() {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic0c145ac87074fe7c38331d6a5add690546e20b6
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/SecurePoll
Gerrit-Branch: master
Gerrit-Owner: Jalexander 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Huji 
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]: Revert "Dump should return decrypted votes"

2017-05-18 Thread Jalexander (Code Review) 
Hello Aaron Schulz, Tim Starling, Huji, Chad, Reedy, jenkins-bot, Anomie,

I'd like you to do a code review.  Please visit

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

to review the following change.


Change subject: Revert "Dump should return decrypted votes"
..

Revert "Dump should return decrypted votes"

For large elections the decryption takes too long (same reason tally page 
doesn't work) and prohibits use of the dump page because of timeout. 

This reverts commit d2eac8c31231136e8df57a30f88ff75d7231f102.

Change-Id: Ic0c145ac87074fe7c38331d6a5add690546e20b6
---
M includes/pages/DumpPage.php
1 file changed, 1 insertion(+), 16 deletions(-)


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

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

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic0c145ac87074fe7c38331d6a5add690546e20b6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SecurePoll
Gerrit-Branch: master
Gerrit-Owner: Jalexander 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Huji 
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