This is an archive of the discontinued Mercurial Phabricator instance.

Differential D142

infinitepush: add server-side bundle limit
ClosedPublic

Authored by stash on Jul 19 2017, 7:06 AM.

Download Raw Diff

Details

Reviewers

ryanmce

Group Reviewers

Restricted Project

Commits

rFBHGX9620d5580544: infinitepush: add server-side bundle limit

Summary

We've had problems when users sent huge bundles to the server.
Let's limit the size of the bundle.

Test Plan

Run infinitepush tests

Diff Detail

Repository

rFBHGX Facebook Mercurial Extensions

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

Event Timeline

stash created this revision.Jul 19 2017, 7:06 AM

ryanmce requested changes to this revision.Jul 19 2017, 7:38 AM

ryanmce added a subscriber: ryanmce.

ryanmce added inline comments.

infinitepush/__init__.py
1011–1014	Mismatch here in size limit.

This revision now requires changes to proceed.Jul 19 2017, 7:38 AM

(facepalm)
Thanks for catching!

addressed comments

ryanmce accepted this revision.Jul 19 2017, 10:10 AM

ryanmce added inline comments.

infinitepush/__init__.py
1015	It might be worth making the 100 MB thing dynamic, but meh.

This revision is now accepted and ready to land.Jul 19 2017, 10:10 AM

Closed by commit rFBHGX9620d5580544: infinitepush: add server-side bundle limit (authored by stash). · Explain WhyJul 20 2017, 6:44 AM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			infinitepush/__init__.py (5 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	297		Jul 19 2017, 7:06 AM	★	★
Diff 2	303	addressed comments	Jul 19 2017, 10:00 AM	★	★
Diff 3	341	rFBHGX9620d55805445e1976ecda8068023fbb37553a3f	Jul 20 2017, 4:23 AM	★	★

Diff 341

infinitepush/init.py

	# with multiple heads, we will place the bookmark on the last head.			# with multiple heads, we will place the bookmark on the last head.
	bookmarknode = nodesctx[-1].hex() if nodesctx else None			bookmarknode = nodesctx[-1].hex() if nodesctx else None
	key = None			key = None
	if newheadscount:			if newheadscount:
	with open(bundlefile, 'r') as f:			with open(bundlefile, 'r') as f:
	bundledata = f.read()			bundledata = f.read()
	with logservicecall(log, 'bundlestore',			with logservicecall(log, 'bundlestore',
	bundlesize=len(bundledata)):			bundlesize=len(bundledata)):
				bundlesizelimit = 100 * 1024 * 1024 # 100 MB
				if len(bundledata) > bundlesizelimit:
				error_msg = ('bundle is too big: %d bytes. ' +
				'max allowed size is 100 MB')
				ryanmceUnsubmitted Not Done Mismatch here in size limit. ryanmce: Mismatch here in size limit.
				raise error.Abort(error_msg % (len(bundledata),))
				ryanmceUnsubmitted Not Done It might be worth making the 100 MB thing dynamic, but meh. ryanmce: It might be worth making the 100 MB thing dynamic, but meh.
	key = store.write(bundledata)			key = store.write(bundledata)

	with logservicecall(log, 'index', newheadscount=newheadscount), index:			with logservicecall(log, 'index', newheadscount=newheadscount), index:
	if key:			if key:
	index.addbundle(key, nodesctx)			index.addbundle(key, nodesctx)
	if bookmark:			if bookmark:
	index.addbookmark(bookmark, bookmarknode)			index.addbookmark(bookmark, bookmarknode)
	_maybeaddpushbackpart(op, bookmark, bookmarknode,			_maybeaddpushbackpart(op, bookmark, bookmarknode,