Commit Graph

376 Commits (master)

Author SHA1 Message Date
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
Hai Brenner e042779b15 Initial code for the Voting Booth.
Still missing components:
1. An implementation of the encryptor (currently program crashes when trying to encrypt the PlaintextBallot)
2. The output device implementation should change to a runnable thread (with commands queue as the ui)

Also needs to add comments EVERYWHERE.
2016-05-04 17:46:05 +03:00
tzlil.gon e677355040 comments: 2016-04-17 09:09:13 +03:00
tzlil.gon b4e5040814 comments 2016-04-17 09:08:21 +03:00
arbel.peled 4c33e923b2 Implemented Synchronizer and Cached Client
Not tested yet
2016-04-16 19:50:09 +03:00
arbel.peled 9ed728fca7 Added message counting ability to the server (but not to the client)
Added synchronous CompleteBatch read by the client
Started implementing the synchronizer
Added support for null callbacks
2016-04-14 09:20:11 +03:00
Tal Moran 1f8df95895 More refactoring for tests and protocol -- user class now handles all messages synchronously (in the main thread); concurrency is now simpler) 2016-04-14 03:34:54 +03:00
arbel.peled 48b2b9efa2 Merge branch 'Cached-Client' of https://cs.idc.ac.il/rhodecode/meerkat/meerkat-java into Cached-Client 2016-04-13 10:38:43 +03:00
Arbel Deutsch Peled c806e7b32a Added Deletion to Bulletin Board Server and Local Client 2016-04-13 09:46:24 +03:00
Tal Moran c798e827dc More renaming and refactoring of DKG code 2016-04-12 02:21:46 +03:00
Tal Moran 78207532ec protobuf naming convention 2016-04-11 20:51:40 +03:00
Tal Moran d2373c09f2 Merge with master 2016-04-11 20:14:18 +03:00
Tal Moran 1ec02173e7 package renaming and protobuf moves 2016-04-11 19:48:36 +03:00
Arbel Deutsch Peled 67b01032d0 Merge branch 'Cached-Client' 2016-04-11 14:23:05 +03:00
Arbel Deutsch Peled e904caa74f Added certificates to version control 2016-04-11 14:21:36 +03:00
Arbel Deutsch Peled edfd47a98d Fixed H2 test time (by using a connection pool)
Added same fix to MySQL
Fixed and tested H2 SyncQuery
2016-04-11 14:13:26 +03:00
Arbel Deutsch Peled 07aecd5237 TimestampComparator name change 2016-04-11 12:26:02 +03:00
Arbel Deutsch Peled 857821c0e4 Adding one more file to version control 2016-04-11 12:17:05 +03:00
tzlil.gon d0951f8644 stop 2016-04-08 21:48:08 +03:00
tzlil.gon 3e1f59ec2b switch secret with share 2016-04-08 15:46:54 +03:00
tzlil.gon 5d564c834c generic group + wait instead of sleep 2016-04-08 15:04:07 +03:00
tzlil.gon 0ae9719bc5 generic group + wait instead of sleep 2016-04-08 15:03:32 +03:00
Tal Moran 4f608e813d Code review comments and channges 2016-04-05 15:36:00 +03:00
Tal Moran f5410bedf4 Typo fixes 2016-04-05 11:51:01 +03:00
Tal Moran 19e52344f5 Merged move to public qilin version 2016-04-05 11:49:34 +03:00
Tal Moran d99bf4123e Merge remote-tracking branch 'origin/master' into mixer 2016-04-05 11:32:19 +03:00
Tal Moran 6d6e4748b7 merge 2016-04-05 11:32:07 +03:00