meerkat
/
meerkat-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
179 Commits
19 Branches
0 Tags
3.3 MiB
Commit Graph

179 Commits (88991ea9ff89de02ec854557a6194fdaf35e03a5)

Author SHA1 Message Date
Hai Brenner 88991ea9ff Refactor: some more comments, and better looking code in VotingBoothImpl.java 2016-07-12 15:32:22 +03:00
Hai Brenner 0956fa98d3 Refactor: add comments to VotingBoothImpl.java, and rename tasks to commands (because they were two names of the same thing) 
Signed-off-by: Hai Brenner <haibrenner@gmail.com>
 2016-07-12 15:23:46 +03:00
Hai Brenner 42d68b7ce8 Test: Add NetworkVirtualPrinterTest 2016-07-12 11:54:50 +03:00
Hai Brenner 5404bb9ed2 Fix error in setting name of output device thread 2016-07-12 11:51:16 +03:00
Hai Brenner f2836d277a Add polling-station project dependency to VB build.gradle for testing purposes 2016-07-12 11:50:21 +03:00
Hai Brenner b667de95aa Fix protobuf definition of EncryptedBallot to match the standard convention. 2016-07-12 11:49:25 +03:00
Hai Brenner 49551dc36b Merge branch 'master' into vbdev2 
Conflicts:
	meerkat-common/src/main/proto/meerkat/voting.proto
 2016-07-06 21:55:34 +03:00
Hai Brenner 88c4e0e644 Merge branch 'master' of https://cs.idc.ac.il/rhodecode/meerkat/meerkat-java 2016-07-06 21:45:35 +03:00
Hai Brenner d804f0dbac voting-booth gradle.build now has dependencies on jetty and RESTful API for testing purposes 2016-07-06 21:33:30 +03:00
Hai Brenner b1a033da5e Add the channel identifier to the PlaintextBallot, so it is now printed by the output device 2016-07-06 13:24:10 +03:00
Hai Brenner 853a6b5684 Another (final) Generics type fix 2016-07-04 16:05:52 +03:00
Hai Brenner 2336d44ffc reduced more compilation warnings by having better Generics type handling and better JavaDocs 2016-07-04 16:04:04 +03:00
Hai Brenner d8b766725b Removed many compilation warnings by having better handling of Generics types and better JavaDocs 2016-07-04 15:52:05 +03:00
Hai Brenner 218677fd96 added many comments and JavaDocs 2016-07-04 14:17:11 +03:00
Hai Brenner 2b56928e9a added some JavaDoc comments and documentation 2016-07-04 11:54:36 +03:00
Hai Brenner 7db6218735 fixed: access to the static system messages from the StorageManage class, rather than its instance 2016-07-04 11:53:28 +03:00
Hai Brenner 66e5db9f22 cleared some unnecessary imports 2016-07-04 11:51:49 +03:00
arbel.peled 48bf8dbe6b Ignore .arcconfig 2016-06-28 15:10:38 +03:00
arbel.peled 8aada21119 Fixed some errors in the tests. 
Made Threaded Client parameterized (with respect to waiting times and thread count).
 2016-06-28 15:08:36 +03:00
Hai Brenner e298ab1e76 removed two unnecessary imports 2016-06-28 11:35:36 +03:00
Hai Brenner 14fac728b3 1. ScannedData now has a Channel and a SignedEncryptedBallot attributes, 
rather than just 'data' attribute
2. Implemented a NetworkVirtualPrinter output device, and now both
   this class and the previous SystemConsoleOutputDevice extend the same
   new abstract class AsyncRunnableOutputDevice which supplies default
   implementations for the interface methods.
 2016-06-28 11:32:00 +03:00
Hai Brenner 3a5908ac49 A cancel by the voter is now sent to the execution flow as a Throwable 
rather than an Exception.
 2016-06-28 11:28:14 +03:00
Hai Brenner 438df78e36 Changed the ToySignature test file to match the new Signature interface. 2016-06-28 11:26:50 +03:00
Hai Brenner 4379921445 For some reason restful API did not appear in my gradle.build. It is fixed now. 2016-06-28 11:26:00 +03:00
arbel.peled 53d609bfee Removed database address from Bulletin Board Server init method (the address is given to the Query Provider). 
Added integration tests for Single Server Bulletin Board Client.
Fixed subscription logic in the Single Server Bulletin Board Client.
Decoupled Single Server- and Simple- Bulletin Board Clients (Simple-... is now obsolete).
Fixed some bugs.
Threaded Bulletin Board Client now has some errors in integration.
 2016-06-28 08:19:29 +03:00
Hai Brenner d12ad408c4 Merge branch 'master' into vbdev2 
Conflicts:
	meerkat-common/src/main/proto/meerkat/voting.proto
 2016-06-26 17:17:24 +03:00
Hai Brenner 06d69554d9 fixed some merge conflicts which appeared for some unknown reason 2016-06-26 17:07:03 +03:00
Arbel Deutsch Peled cc2888483d Threaded Client integration tests passing 2016-06-26 14:32:30 +03:00
Arbel Deutsch Peled d1f7413cde Working client-side Batch changes 2016-06-26 13:06:16 +03:00
Hai Brenner 42ae18df00 Just added comments as part of the process to comment all the VB files. 
Currently I commented the controller callbacks and commands packages, and
also the QuestionSelector component.
 2016-06-21 15:37:20 +03:00
Hai Brenner e9732561f4 Removed the last dependency on the obsolete SystemMessages class. 
This dependency was left by mistake.
We now read all the system messages of the VB from a protobuf file
using the StorageManager component.
 2016-06-21 15:35:42 +03:00
Hai Brenner 19deec00bb a change of variable name to suggest its insignificance 2016-06-20 16:15:41 +03:00
Hai Brenner 559c714aac testing was changed according to the new interface of storage manager 2016-06-20 15:27:39 +03:00
Hai Brenner 2bdf92b075 Fixed some stuff according to Arbel's suggestions. 
Specifically:
1. now handling exceptions in the encryption process (according to voter's choice)
2. handling files in storage manager (now reading election parameters and system messages from files)
3. Controller's init() now already sets all the info and parameters. No need to call extra functions
4. some more changes to the method structure
 2016-06-20 15:26:53 +03:00
Arbel Deutsch Peled 1951db546d Changed Bulletin Board Message payload to either data or message ID 
Added server-generated unique batch identifiers
Changed Client-side interfaces
Refactored Client-side code for new batch mechanisms

Not tested on client-side yet
 2016-06-19 22:00:43 +03:00
Arbel Deutsch Peled b501992643 Complete overhaul of batch system on server-side 
Added batch methods to BulletinBoardUtils
Related changes in BulletinBoardDigest and BulletinBoardSignature

Merge remote-tracking branch 'origin/master' into Cached-Client

Conflicts:
	bulletin-board-client/src/main/java/meerkat/bulletinboard/SimpleBulletinBoardClient.java
	bulletin-board-client/src/main/java/meerkat/bulletinboard/ThreadedBulletinBoardClient.java
	bulletin-board-server/src/main/java/meerkat/bulletinboard/sqlserver/BulletinBoardSQLServer.java
	bulletin-board-server/src/main/java/meerkat/bulletinboard/sqlserver/H2QueryProvider.java
	bulletin-board-server/src/main/java/meerkat/bulletinboard/sqlserver/MySQLQueryProvider.java
	bulletin-board-server/src/main/java/meerkat/bulletinboard/webapp/BulletinBoardWebApp.java
	bulletin-board-server/src/main/proto/meerkat/bulletin_board_server.proto
	meerkat-common/src/main/java/meerkat/bulletinboard/BulletinBoardClient.java
	meerkat-common/src/main/java/meerkat/bulletinboard/BulletinBoardServer.java
 2016-06-16 11:21:58 +03:00
Hai Brenner 13f8948cfb change the output class to run as a thread. 
It is now runnable and has its own queue of (also new) OutputCommands, and its own shutdown flag.
 2016-06-15 19:32:05 +03:00
Arbel Deutsch Peled 337a135151 Started removing dependency on CompleteBatch. 
Tags of batches are now stored as a blob until the batch is complete.
 2016-06-15 10:34:46 +03:00
Hai Brenner 76d3fdeac2 Fixed the Selector classes. 
Fixed the crypto classes to handle signatures as well.
Some more other fixes
 2016-06-07 16:15:08 +03:00
arbel.peled ffac7c1e34 Fixed all of Tal's remarks. 
Switched to using the predefined BoolValue Protobuf.
 2016-06-02 14:48:48 +03:00
arbel.peled 229cbfd48f Fixed some subscription functionality of the CachedClient 2016-06-02 13:01:41 +03:00
arbel.peled fe209f6b5a Removed default testing for the Bulletin Board Client. 2016-06-02 10:39:29 +03:00
arbel.peled e2f3dbe6b2 Fixed some more issues (most have to do with concurrency). 
Implemented close method for the SQLServer which renders it unusable until reinitialization.
Added test for Synchronizer for the case when the remote server is unavailable (test passes).
Still need to fix Batch digest and sign issue.
 2016-06-02 10:38:31 +03:00
Arbel Deutsch Peled e91a48b5e1 Fixed a few bugs. 
Changed H2 Query Provider to run in-memory.
 2016-06-01 22:46:51 +03:00
arbel.peled 7c60e487cc Created a test for the Synchronizer. 
Not passing yet.
 2016-06-01 21:34:17 +03:00
arbel.peled 347e826f73 Working integrated version of Scanner WebApp 
Fully testsed
Moved BoolMsg and IntMsg to Comm package (from BulletinBoardAPI)
 2016-05-31 15:26:56 +03:00
Hai Brenner 94f3920e6d Many fixes, some are still only in temporary phase, according to what Arbel told me to do so far. 2016-05-23 14:43:01 +03:00
arbel.peled 061dc69fbc File rename 2016-05-05 17:01:00 +03:00
arbel.peled b934894bc5 Created Polling Station Scanner interface 
Implemented Web App for the scanner
Not tested
 2016-05-05 16:55:10 +03:00
Hai Brenner c04ed42dca possible future protobufs for handling category channel selection. 
Summary:
The initial code for the voting booth.
Some things are still missing:
1. comments EVERYWHERE
2. an implementation for the encryptor (program crashes when trying to encrypt PlaintexBallot)
3. the OutputDevice class should become a thread, (runnable with a queue of commands as the UI component)

Test Plan: Currently only simply run it with another main class.

Reviewers: arbel.peled

Differential Revision: https://proj-cs.idc.ac.il/D3
 2016-05-04 17:58:06 +03:00