summaryrefslogtreecommitdiff
path: root/src/node
AgeCommit message (Collapse)Author
2012-11-03merged develop back inPeter 'Pita' Martischka
2012-11-02Add a setting for customizing the app titleMarcel Klehr
the app title is inserted into the <title> of all tepmlates
2012-11-01Put up some '/admin doesn't exist' notice.Marcel Klehr
2012-11-01Allow robots.txt to be customJohn McLear
2012-11-01Pass on the req object to eejs hooksMarcel Klehr
2012-11-01Pass on the render args to all eejs hooksMarcel Klehr
eejs.require('foo', {..render args..}) will be passed on to all eejsBlock_X hooks as `hookContext.renderContext`
2012-10-29Merge pull request #1097 from Pita/developPeter 'Pita' Martischka
Pull in Develop branch so we can test latest develop
2012-10-28Make sure npm is initialized before requiring things (fix #1092)Marcel Klehr
2012-10-27wrap spec files with a describePeter 'Pita' Martischka
2012-10-27load list of spec files from the serverPeter 'Pita' Martischka
2012-10-27redirect from frontend to frontend/Peter 'Pita' Martischka
2012-10-27Merge branch 'develop' of github.com:Pita/etherpad-lite into ↵Peter 'Pita' Martischka
feature/frontend-tests
2012-10-25Add default port of process.env.PORT if port isnt specified in settings.jsonRandy
2012-10-11Merge pull request #1035 from amtep/developJohn McLear
Guard against malicious clients in USERINFO_UPDATE handling
2012-10-11Merge pull request #1057 from dmitryuv/sync-processingMarcel Klehr
fix for error handling in the callback code
2012-10-11fix for error handling in callback codeDmitry
The callback code does not follow error handling guidelines, thus always receiving NULL instead of results array.
2012-10-11Merge pull request #1056 from dmitryuv/sync-processingMarcel Klehr
Fix variable name in handleMessageHook
2012-10-11fixed variable name in handleMessageHookDmitry
the code would never work as expected with this type
2012-10-09Drop method deprecated in Express 3.x.Chad Weider
2012-10-08major restructering of the front end test frameworkPeter 'Pita' Martischka
2012-10-06Remove two instances of the same function nameJohn McLear
Both functions did the same thing, the first function was buggy.  Might be worth someone looking through the history of this file and pointing out when I made this heinous error ;)
2012-10-05Merge pull request #1034 from d-a-n/developJohn McLear
Added hooks for pad events create/edit/load/remove
2012-10-04Merge branch 'develop' of github.com:Pita/etherpad-lite into ↵johnyma22
feature/frontend-tests
2012-10-03Changed pad_id to padID to follow projct standards.d-a-n
2012-10-03Changed pad hook names to follow naming conventions. Arguments will now be ↵d-a-n
passed as hash.
2012-10-03Merge branch 'develop' into express-v3Marcel Klehr
Conflicts: src/node/hooks/express/errorhandling.js
2012-10-02USERINFO_UPDATE: construct a new message for broadcastRichard Braakman
The server was reusing the client's message when broadcasting userinfo updates. This would allow a malicious client to insert arbitrary fields into a message that the other clients would trust as coming from the server. For example, adding "disconnect" or renaming other authors. This commit fixes it by having the server construct a new message with known fields before broadcasting.
2012-10-02Added pad hooks (create, load, edit, remove)d-a-n
2012-10-02Don't shut down the whole server, if error handling middleware is called.Marcel Klehr
The errors passed to error handling middleware aren't that severe, so it's fine to just stay alive...
2012-10-02Setted up an enviroment for frontend tests, first stepsPeter 'Pita' Martischka
2012-09-28Prevent server crash in handleClientReadyRichard Braakman
The client might have disconnected between callbacks so don't try to write to the session before checking this. The main callback of this function now has a single check at its top. Removed a redundant check halfway through the callback. Also normalized use of client.id for the session index instead of a mix of client.id and sessionId. Added some explanatory comments.
2012-09-28Add some explanatory comments to handleUserChanges()Richard Braakman
2012-09-27Prettify session handling in handleUserChangesRichard Braakman
Also add a comment to explain what's going on with thisSession. No changes in behavior.
2012-09-26Fix crash when client submits changeset based on too-old revisionRichard Braakman
We had a problem with the server running out of stack space if a client submitted a changeset based on a revision more than about 1000 revs old. (944 was our cutoff but yours may vary). This happened in the wild with about 30 people editing via flaky wifi. A disconnected client would try to submit a fairly old changeset when reconnecting, and a few minutes was enough for 30 people to generate that many revs. The stack kept growing because pad.getRevisionChangeset was being answered from the cache, so no I/O interrupted the callback chain. (This was seen with mysql, I don't know about other backends.) This patch forces a nextTick every 200 revisions to solve this problem.
2012-09-26Fix sessioninfos race that can cause crash during USER_CHANGES handlingRichard Braakman
When stress testing etherpad-lite we occasionally got this error: TypeError: Cannot read property 'author' of undefined at /home/etherpad/etherpad-lite/src/node/handler/PadMessageHandler.js:556:47 handleUserChanges was accessing sessioninfos[client.id].author in a callback, after spending some time in the loop that updates the changeset to the latest revision. It's possible for a disconnect request to be processed during that loop so the session might no longer be there. This patch fixes it by looking up the author at the start of the function.
2012-09-22Fix socket.io auth: Use connect to parse signed cookies (migrate to express v3)Marcel Klehr
2012-09-22Migrate error handling middleware to express v3Marcel Klehr
2012-09-22Set secret on cookieParser (migrate to express v3)Marcel Klehr
2012-09-22Fix res.send (migrate to express v3)Marcel Klehr
2012-09-21Upgrade log4js to v0.5Marcel Klehr
2012-09-21Differentiate between http server and express appMarcel Klehr
2012-09-19Fix async.forEach in MultiSession codeMarcel Klehr
2012-09-19Revert "Fixed foreach loop on session IDs, was breaking EP on single session ↵Marcel Klehr
in cookie." This reverts commit 443a71bc9ce33b150fbfd06332a20b072250c24e. modified: src/node/db/SecurityManager.js
2012-09-18Merge pull request #1014 from marcelklehr/feature/list-all-groupsJohn McLear
Add listAllGroups API endpoint
2012-09-18Fixed foreach loop on session IDs, was breaking EP on single session in cookie.johnyma22
2012-09-17Add listAllGroups API endpointMarcel Klehr
Adds a database key that lists all groups
2012-09-17Still support API endpoints of v1 in v1.1Marcel Klehr
2012-09-13Bump API version to v1.1Marcel Klehr
2012-09-12attempt to put correct init in right place but could be wrongjohnyma22
2012-09-12error handling and close is removed in express 3johnyma22