Commit Graph

253 Commits

Author SHA1 Message Date
Kyle Isom
a63eaba58f Re-add integration tests.
This uses the prometheus endpoint to determine whether the redoctober
server has started.
2016-06-06 13:22:53 -07:00
Kyle Isom
79269824ee Add initial prometheus support to redoctober.
This doesn't add any redoctober-specific metrics yet; it's primarily
intended to be a healthcheck at this point.
2016-05-27 14:01:41 -07:00
Kyle Isom
f0590e3df8 Merge pull request #141 from cloudflare/kyle/limit-listener
Remove LimitListener.
2016-05-06 15:08:26 -07:00
Kyle Isom
31fddde23b Remove LimitListener. 2016-05-06 14:59:35 -07:00
Kyle Isom
2e3c4f4940 Merge pull request #137 from cloudflare/kyle/remove-integration-test
Remove integration test.
2016-05-05 18:46:58 -07:00
Kyle Isom
ab9de37fad Remove integration test.
The servers are unreliable, and an improved test suite should be
built. The tests as they stand now aren't helping.
2016-05-04 23:27:21 -07:00
Zi Lin
297594b3ac Merge pull request #136 from cloudflare/kyle/no-http2
redoctober: disable HTTP/2.
2016-05-04 23:21:36 -07:00
Kyle Isom
6a38dec38d redoctober: disable HTTP/2.
There is an issue connecting to the HTTPS UI with HTTP/2 support.
Debugging is ongoing, but the immediate fix is to disable HTTP/2.
2016-05-04 18:32:35 -07:00
Kyle Isom
5b4b4644f8 Merge pull request #135 from APTy/travis-go1.5
Upgrade to Go 1.5 in Testing
2016-04-13 11:36:51 -07:00
Tyler J
2200e27fef travis: Upgrade to Go 1.5 and remove install of x/tools/cmd/vet 2016-04-13 10:31:37 -07:00
Kyle Isom
577d9570b1 Merge pull request #132 from jfrazelle/cleanup-some
moved some things around
2016-03-11 13:31:13 -08:00
Jessica Frazelle
2e6fdf15c6 add script to validate nothing was changed that needed to re-run go generate
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2016-03-09 18:58:08 -08:00
Jessica Frazelle
4340039d5b use go generate so index.html contents are not in redoctober.go
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2016-03-09 18:58:05 -08:00
Jessica Frazelle
382a6afe07 move flag parsing into init
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2016-03-09 18:29:05 -08:00
Zi Lin
1aedf3d1b3 Merge pull request #129 from cloudflare/zi/fix-reencrypt
fix re-encrypt cli tool for new access structure requirement
2016-02-26 08:31:31 -08:00
Zi Lin
1d61a4511b fix re-encrypt cli tool for new access structure requirement 2016-02-26 08:23:53 -08:00
Zi Lin
7a299a1897 Merge pull request #128 from cloudflare/nick/nodrone
Remove drone.io badge from README.
2016-02-22 11:56:12 -08:00
Nick Sullivan
19d3852ff3 Remove drone.io badge from README. 2016-02-19 13:38:30 -08:00
Kyle Isom
8afbf91e09 Merge pull request #127 from cloudflare/zi/fix-minimum
Access structure should be invalide when Minimum == 0 with non-nil Names
2016-02-19 11:53:09 -08:00
Kyle Isom
324728f6c8 Merge pull request #126 from cloudflare/zi/owners-request-client-support
add support to Owners request to server
2016-02-19 11:52:43 -08:00
Zi Lin
7a806308d3 Access structure should be invalide when Minimum == 0 with non-nil Names 2016-02-19 10:17:45 -08:00
Zi Lin
a03c794895 add support to Owners request to server 2016-02-19 09:50:25 -08:00
Jacob H. Haven
080ee17d75 Merge pull request #124 from pra85/patch-1
Fix typos in Readme
2016-02-19 06:39:28 -08:00
Prayag Verma
287b889e64 Fix typos in Readme
`enviroment` → `environment`
`ecrypted` → `encrypted`
2016-02-19 13:08:36 +05:30
Kyle Isom
71ddc45764 Merge pull request #123 from ejcx/ej/wrongPort
Use port 8080...
2016-02-18 13:04:37 -08:00
ejcx
d4a814fcec Don't use this port. Tests depend on 8080 2016-02-18 13:06:41 -08:00
Nick Sullivan
18b5ac859f Merge pull request #122 from ejcx/nonReqHipchatName
Don't require a hipchat name
2016-02-01 19:31:25 -08:00
ejcx
7c95b54aa8 Don't require a hipchat name for create user 2016-02-01 18:41:49 -08:00
Nick Sullivan
8a2a0396f7 Merge pull request #120 from benburkert/simplify-newserver
redoctober: simplify the NewServer signature
2016-02-01 17:29:56 -08:00
Nick Sullivan
122b185baf Merge pull request #121 from ejcx/hipchatMessage
Send a message. Not a notification
2016-02-01 09:54:42 -08:00
ejcx
c6388feb57 Send a message. Not a notification 2016-02-01 09:55:06 -08:00
Ben Burkert
6f8424ad38 redoctober: simplify the NewServer signature
Remove the unexported type used in the NewServer func so that it may be
used outside this package, which allows for integration style tests that
start an instance of a RO server.

The channel based request locking has been replaced with LimitListener,
which prevents simultaneous handling of TCP connections.
2016-01-30 00:24:34 +00:00
Nick Sullivan
cac6da28c4 Merge pull request #106 from ejcx/ordermsp
Add hipchat and ordering support to redoctober
2016-01-29 15:57:16 -08:00
ejcx
6991a38586 Take a slice of users for orders
Don't assume that the creator of the order wants the delegations.
Instead it's much nicer with our current scheme to take in a big
slice of people who want delegations, so that each person who ne
eds a delegation doesn't need to make an order.
2016-01-29 15:51:38 -08:00
ejcx
9292e137d2 Take care of Nick's nitpicks. All good changes 2016-01-25 16:48:42 -08:00
ejcx
52f350d17f Fix uses being a string and breaking tests 2016-01-21 12:40:55 -08:00
ejcx
63055fa438 Fix confusion of using a var named same as time package 2016-01-21 12:34:36 -08:00
ejcx
378ebddf90 Make red october have slices of labels, and a link generator 2016-01-21 12:31:24 -08:00
Jacob H. Haven
48fd0baab9 Add order support to ro client 2016-01-14 14:08:25 -08:00
Nick Sullivan
434f0b61d7 Merge pull request #118 from cloudflare/brendan/bens-refactor
Import Ben's Refactor
2016-01-13 14:48:35 -08:00
e
95940ed3fa Add hipchat and ordering support to redoctober. Also fix XSS in RO
Supports MSP and requires several arguments to add hipchat integration to
red october. RedOctober will then alert on creation of an order, any new
delegation, or several other states.
2016-01-12 11:21:47 -08:00
Brendan Mc
e8f30ae4a1 Don't cast to cryptor.UserDatabase to msp.UserDatabase. 2015-12-13 20:16:06 -08:00
Brendan Mc
1e699edc00 Import Ben's changes to MSP. 2015-12-13 17:12:38 -08:00
Zi Lin
1bfa291c37 Merge pull request #109 from andrewbuss/keycache_active_evict
Fix "invalid key size 0" when decrypting after a delegation expires
2015-12-04 22:48:17 -08:00
Zi Lin
9e54751efc Merge pull request #113 from cloudflare/jkroll/listen-tls
Modify the way we listen on TLS
2015-12-04 15:12:26 -08:00
Nick Sullivan
eb38e1afe3 Merge pull request #111 from Bren2010/brendan/parsers
Rewrite MSP parsers.
2015-12-04 13:01:24 -08:00
Brendan McMillion
5e1cff9d9d Rewrite MSP parsers.
- Stop using container/list.  It requires casting which keeps causing panics.
- Justify all slice accesses.  Nil pointers also keep causing panics.
2015-12-04 11:32:00 -08:00
Andrew Buss
24fc3bb7d8 Fix "invalid key size 0" when decrypting after a delegation expires
The keycache does not remove active delegations when uses drops to zero;
rather it only removes these when Refresh is called.

So Valid returns true even if the user's delegation has expired,
so fullMatch is not set to false in unwrapKey,
so DecryptKey fails since the keycache refreshes and finds the delegation has expired,
so tmpKeyValue is left empty and decryptErr is set.

Since decryptErr is only used to break out of the inner loop, and
fullMatch wasn't set to false, no error is returned from unwrapKey.
So aesKey in DecryptKey is an empty string, causing an error when
passed to aes.NewCipher.

This commit actively removes a delegation from the keycache when it
is used for the last time, and properly handles errors thrown by
DecryptKey in unwrapKey.
2015-12-04 02:15:53 -08:00
Nick Sullivan
d89bb05295 Merge pull request #104 from andrewbuss/single_owner
Allow encryption with a single owner
2015-12-03 17:36:45 -08:00
Kyle Isom
0c286e1166 Merge pull request #108 from j-delaney/go-version
Upadte README to specify Go 1.4
2015-12-03 12:57:07 -08:00