forked from eclipse-leshan/leshan
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Enhance the way we handle InvalidRequest from foreign peer.
- Loading branch information
1 parent
680ee7d
commit ca15e3d
Showing
10 changed files
with
171 additions
and
96 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
98 changes: 98 additions & 0 deletions
98
leshan-core-cf/src/main/java/org/eclipse/leshan/core/californium/LwM2mCoapResource.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,98 @@ | ||
| /******************************************************************************* | ||
| * Copyright (c) 2019 Sierra Wireless and others. | ||
| * | ||
| * All rights reserved. This program and the accompanying materials | ||
| * are made available under the terms of the Eclipse Public License v1.0 | ||
| * and Eclipse Distribution License v1.0 which accompany this distribution. | ||
| * | ||
| * The Eclipse Public License is available at | ||
| * http://www.eclipse.org/legal/epl-v10.html | ||
| * and the Eclipse Distribution License is available at | ||
| * http://www.eclipse.org/org/documents/edl-v10.html. | ||
| * | ||
| * Contributors: | ||
| * Sierra Wireless - initial API and implementation | ||
| *******************************************************************************/ | ||
| package org.eclipse.leshan.core.californium; | ||
|
|
||
| import org.eclipse.californium.core.CoapResource; | ||
| import org.eclipse.californium.core.coap.CoAP.ResponseCode; | ||
| import org.eclipse.californium.core.coap.MediaTypeRegistry; | ||
| import org.eclipse.californium.core.coap.Request; | ||
| import org.eclipse.californium.core.coap.Response; | ||
| import org.eclipse.californium.core.network.Exchange; | ||
| import org.eclipse.californium.core.server.resources.CoapExchange; | ||
| import org.eclipse.leshan.core.request.exception.InvalidRequestException; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| /** | ||
| * A Common {@link CoapResource} used to handle LWM2M request. | ||
| * <p> | ||
| * It provides mainly features about error handling. | ||
| */ | ||
| public class LwM2mCoapResource extends CoapResource { | ||
|
|
||
| private static final Logger LOG = LoggerFactory.getLogger(LwM2mCoapResource.class); | ||
|
|
||
| /** | ||
| * @see CoapResource#CoapResource(String) | ||
| */ | ||
| public LwM2mCoapResource(String name) { | ||
| super(name); | ||
| } | ||
|
|
||
| @Override | ||
| public void handleRequest(Exchange exchange) { | ||
| try { | ||
| super.handleRequest(exchange); | ||
| } catch (InvalidRequestException e) { | ||
| handleInvalidRequest(exchange, e.getMessage(), e); | ||
| } catch (RuntimeException e) { | ||
| Request request = exchange.getRequest(); | ||
| LOG.error("Exception while handling request [{}] on the resource {} from {}", request, getURI(), | ||
| EndpointContextUtil.extractIdentitySafely(request.getSourceContext()), e); | ||
| exchange.sendResponse(new Response(ResponseCode.INTERNAL_SERVER_ERROR)); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Handle an Invalid Request by sending a BAD_REQUEST response and logging the error using debug level. | ||
| * | ||
| * @param exchange The CoAP exchange linked to the invalid request. | ||
| * @param message The error message describing why the request is invalid. | ||
| */ | ||
| protected void handleInvalidRequest(CoapExchange exchange, String message) { | ||
| handleInvalidRequest(exchange.advanced(), message, null); | ||
| } | ||
|
|
||
| /** | ||
| * Handle an Invalid Request by sending a BAD_REQUEST response and logging the error using debug level. | ||
| * | ||
| * @param exchange The exchange linked to the invalid request. | ||
| * @param message The error message describing why the request is invalid. | ||
| * @param error An {@link Throwable} raised while we handle try create a LWM2M request from CoAP request. | ||
| */ | ||
| protected void handleInvalidRequest(Exchange exchange, String message, Throwable error) { | ||
| Request request = exchange.getRequest(); | ||
|
|
||
| // Log error | ||
| if (LOG.isDebugEnabled()) { | ||
| if (error != null) { | ||
| LOG.debug("Invalid request [{}] received on the resource {} from {}", request, getURI(), | ||
| EndpointContextUtil.extractIdentitySafely(request.getSourceContext()), error); | ||
| } else { | ||
| LOG.debug("Invalid request [{}] received on the resource {} from {} : {}", request, getURI(), | ||
| EndpointContextUtil.extractIdentitySafely(request.getSourceContext()), message); | ||
| } | ||
| } | ||
|
|
||
| // Send Response | ||
| Response response = new Response(ResponseCode.BAD_REQUEST); | ||
| if (message != null) { | ||
| response.setPayload(message); | ||
| response.getOptions().setContentFormat(MediaTypeRegistry.TEXT_PLAIN); | ||
| } | ||
| exchange.sendResponse(response); | ||
| } | ||
| } |
Oops, something went wrong.