node-http-server – Diff between revs 31 and 32

Subversion Repositories:

?pathlinks?

Rev 31 – Rev 35 – Go to most recent revision – Details – Blame – Last modification – View Log

 Handler.prototype.process = function(config, request, response, root) {
 	EventEmitter.call(this);
 	var self = this;
 	// Get client details.
-	const requestAddress = request.socket.address();
+	const address = request.socket.address();
 	// Get requested URL.
 	const requestURL = url.parse(
 		request.url, true
 	fs.realpath(requestPath, (error, resolvedPath) => {
 		// If the path does not exist, then return early.
 		if (error) {
 			self.emit('log', {
 				message: 'Unknown path requested: ' +
-					requestAddress.address + ':' +
+					address.address + ':' +
-					requestAddress.port +
+					address.port +
 					' requesting: ' +
 					requestURL.pathname,
 				severity: 'warning'
 			});
-			self.emit('done', {
+			self.emit('data', {
 				status: 404,
 				data: new stream.Readable({
 					read(size) {
 						this.push(null);
+					}
 				}),
 				type: 'text/plain'
 			});
 			return;
+		}
 		// Check for path traversals early on and bail if the requested path does not
 		// lie within the specified document root.
 		isRooted(resolvedPath, root, path.sep, (rooted) => {
 			if (!rooted) {
 				self.emit('log', {
 					message: 'Attempted path traversal: ' +
-						requestAddress.address + ':' +
+						address.address + ':' +
-						requestAddress.port +
+						address.port +
 						' requesting: ' +
 						requestURL.pathname,
 					severity: 'warning'
 				});
 				self.emit('done', {
 				});
 				// Requested location requires authentication.
 				authentication.check(request, response, (request, response) => {
 					self.emit('log', {
 						message: 'Authenticated client: ' +
-							requestAddress.address + ':' +
+							address.address + ':' +
-							requestAddress.port +
+							address.port +
 							' accessing: ' +
 							requestURL.pathname,
 						severity: 'info'
 					});
 					process.nextTick(() =>
 						serve(self,
 							config,
 							requestPath,
 							requestURL.pathname,
-							requestAddress
+							address
+						)
 					);
 				});
 				return;
+			}
 			// If no authentication is required then serve the request.
 			self.emit('log', {
 				message: 'Client: ' +
-					requestAddress.address + ':' +
+					address.address + ':' +
-					requestAddress.port +
+					address.port +
 					' accessing: ' +
 					requestURL.pathname,
 				severity: 'info'
 			});
 			process.nextTick(() =>
 				serve(self,
 					config,
 					requestPath,
 					requestURL.pathname,
-					requestAddress
+					address
+				)
 			);
 		});