From 6d2ff69c73a3b43b72ee838a4b900125091ebf46 Mon Sep 17 00:00:00 2001 From: Simon Bernard Date: Wed, 26 Jun 2024 17:13:02 +0200 Subject: [PATCH] Refactoring rename module/package - edit file content This aims to implement : https://github.com/eclipse-leshan/leshan/issues/1295 Refactoring was done in 2 commits to try to keep git history : https://stackoverflow.com/questions/2314652/is-it-possible-to-move-rename-files-in-git-and-maintain-their-history --- .gitignore | 2 +- .jenkins/ci.jenkins | 8 +- .jenkins/test.jenkins | 6 +- .jenkins/weekly.jenkins | 4 +- README.md | 22 +++--- SECURITY.md | 75 ++++++++++--------- build-config/lib-build-config/pom.xml | 27 ++++--- leshan-demo-bsserver/logback-config.xml | 8 +- leshan-demo-bsserver/pom.xml | 12 +-- .../demo/bsserver/JSONFileBootstrapStore.java | 8 +- .../bsserver/LeshanBootstrapServerDemo.java | 24 +++--- .../bsserver/cli/LeshanBsServerDemoCLI.java | 16 ++-- .../bsserver/json/ByteArraySerializer.java | 2 +- .../json/EnumSetBindingModeDeserializer.java | 2 +- .../bsserver/json/EnumSetDeserializer.java | 2 +- .../demo/bsserver/json/EnumSetSerializer.java | 2 +- .../bsserver/servlet/BootstrapServlet.java | 8 +- .../demo/bsserver/servlet/EventServlet.java | 2 +- .../demo/bsserver/servlet/ServerServlet.java | 6 +- .../src/main/resources/webapp/index.html | 8 +- leshan-demo-bsserver/webapp/README.md | 4 +- leshan-demo-bsserver/webapp/jsconfig.json | 6 +- leshan-demo-bsserver/webapp/package.json | 2 +- leshan-demo-bsserver/webapp/src/App.vue | 2 +- .../src/components/bsconfig/ServerInput.vue | 2 +- .../components/wizard/ClientConfigDialog.vue | 5 +- .../src/components/wizard/DeleteStep.vue | 8 +- .../src/components/wizard/SecurityStep.vue | 2 +- leshan-demo-bsserver/webapp/src/main.js | 12 +-- .../webapp/src/router/index.js | 4 +- .../webapp/src/views/Bootstrap.vue | 9 ++- leshan-demo-bsserver/webapp/vite.config.js | 6 +- leshan-demo-client/logback-config.xml | 8 +- leshan-demo-client/pom.xml | 14 ++-- .../leshan/demo/client/DtlsSessionLogger.java | 2 +- .../leshan/demo/client/LeshanClientDemo.java | 26 +++---- .../eclipse/leshan/demo/client/MyDevice.java | 2 +- .../leshan/demo/client/MyLocation.java | 2 +- .../demo/client/RandomTemperatureSensor.java | 2 +- .../demo/client/cli/IdentitySection.java | 12 +-- .../demo/client/cli/LeshanClientDemoCLI.java | 18 ++--- .../leshan/demo/client/cli/OscoreSection.java | 6 +- .../cli/interactive/InteractiveCommands.java | 28 +++---- leshan-demo-server/logback-config.xml | 6 +- leshan-demo-server/pom.xml | 18 ++--- .../leshan/demo/server/LeshanServerDemo.java | 28 +++---- .../demo/server/cli/LeshanServerDemoCLI.java | 16 ++-- .../demo/server/model/DdfDownloader.java | 2 +- .../leshan/demo/server/model/FileLister.java | 4 +- .../demo/server/model/ObjectModelSerDes.java | 2 +- .../server/model/ResourceModelSerDes.java | 2 +- .../demo/server/servlet/ClientServlet.java | 12 +-- .../demo/server/servlet/EventServlet.java | 20 ++--- .../server/servlet/ObjectSpecServlet.java | 4 +- .../demo/server/servlet/ServerServlet.java | 6 +- .../servlet/json/JacksonLinkSerializer.java | 2 +- .../json/JacksonLwM2mNodeDeserializer.java | 2 +- .../json/JacksonLwM2mNodeSerializer.java | 2 +- .../json/JacksonRegistrationSerializer.java | 2 +- .../JacksonRegistrationUpdateSerializer.java | 2 +- .../json/JacksonResponseSerializer.java | 2 +- .../json/JacksonSecurityDeserializer.java | 2 +- .../json/JacksonVersionSerializer.java | 2 +- .../demo/server/servlet/log/CoapMessage.java | 2 +- .../servlet/log/CoapMessageListener.java | 2 +- .../server/servlet/log/CoapMessageTracer.java | 2 +- .../src/main/resources/webapp/index.html | 8 +- leshan-demo-server/webapp/README.md | 2 +- leshan-demo-server/webapp/jsconfig.json | 6 +- leshan-demo-server/webapp/package.json | 4 +- leshan-demo-server/webapp/src/App.vue | 2 +- .../CompositeObjectDialog.vue | 6 +- leshan-demo-server/webapp/src/main.js | 12 +-- leshan-demo-server/webapp/src/router/index.js | 4 +- .../webapp/src/views/Security.vue | 10 +-- leshan-demo-server/webapp/vite.config.js | 6 +- leshan-demo-servers-shared/pom.xml | 8 +- .../leshan/demo/servers/cli/DtlsSection.java | 4 +- .../demo/servers/cli/GeneralSection.java | 4 +- .../demo/servers/cli/IdentitySection.java | 10 +-- .../cli/converters/ServerCIDConverter.java | 4 +- .../json/JacksonSecurityDeserializer.java | 2 +- .../json/JacksonSecuritySerializer.java | 2 +- .../demo/servers/json/PublicKeySerDes.java | 2 +- .../servers/json/X509CertificateSerDes.java | 4 +- .../servers/json/servlet/SecurityServlet.java | 10 +-- .../webapp/jsconfig.json | 2 +- leshan-demo-shared/pom.xml | 6 +- .../eclipse/leshan/demo/LeshanProperties.java | 2 +- .../leshan/demo/LwM2mDemoConstant.java | 2 +- .../demo/cli/MultiParameterException.java | 2 +- .../demo/cli/ShortErrorMessageHandler.java | 2 +- .../leshan/demo/cli/StandardHelpOptions.java | 2 +- .../leshan/demo/cli/VersionProvider.java | 4 +- .../demo/cli/converters/CIDConverter.java | 2 +- .../converters/ContentFormatConverter.java | 2 +- .../cli/converters/HexadecimalConverter.java | 2 +- .../cli/converters/InetAddressConverter.java | 2 +- .../cli/converters/LwM2mPathConverter.java | 2 +- .../demo/cli/converters/PortConverter.java | 2 +- .../cli/converters/PrivateKeyConverter.java | 2 +- .../cli/converters/PublicKeyConverter.java | 2 +- .../cli/converters/ResourcePathConverter.java | 2 +- .../StrictlyPositiveIntegerConverter.java | 2 +- .../converters/StringLwM2mPathConverter.java | 2 +- .../cli/converters/TruststoreConverter.java | 2 +- .../demo/cli/converters/VersionConverter.java | 2 +- .../X509CertificateChainConverter.java | 2 +- .../converters/X509CertificateConverter.java | 2 +- .../demo/cli/interactive/InteractiveCLI.java | 2 +- .../interactive/JLineInteractiveCommands.java | 2 +- .../cli/interactive/TerminalAppender.java | 2 +- .../demo/logback/ColorAwarePatternLayout.java | 2 +- .../leshan/demo/logback/NoColorConverter.java | 2 +- .../leshan/demo/ValidateDemoModelsTest.java | 2 +- leshan-integration-tests/pom.xml | 16 ++-- .../tests/DeleteClientOnlyTest.java | 6 +- .../tests/bootstrap/SecureBootstrapTest.java | 6 +- .../tests/lockstep/LockStepLwM2mClient.java | 4 +- .../tests/lockstep/LockStepTest.java | 4 +- .../security/ServerOnlySecurityTest.java | 9 ++- .../tests/send/LockStepSendTest.java | 4 +- .../redis/RedisRegistrationStoreTest.java | 6 +- .../LeshanTestBootstrapServerBuilder.java | 12 +-- .../tests/util/LeshanTestClient.java | 2 +- .../tests/util/LeshanTestClientBuilder.java | 10 +-- .../tests/util/LeshanTestServer.java | 2 +- .../tests/util/LeshanTestServerBuilder.java | 15 ++-- leshan-lwm2m-client/pom.xml | 8 +- .../leshan/client/LeshanClientBuilder.java | 2 +- leshan-lwm2m-core/pom.xml | 2 +- leshan-lwm2m-server-redis/pom.xml | 4 +- leshan-lwm2m-server/pom.xml | 8 +- .../leshan/server/LeshanServerBuilder.java | 2 +- .../LeshanBootstrapServerBuilder.java | 2 +- leshan-tl-cf-client-coap/pom.xml | 10 +-- .../CaliforniumConnectionController.java | 2 +- .../client/LwM2mClientCoapResource.java | 8 +- .../ObserveCompositeRelationFilter.java | 4 +- .../californium/client/RootResource.java | 10 +-- .../client/bootstrap/BootstrapResource.java | 10 +-- .../endpoint/CaliforniumClientEndpoint.java | 12 +-- .../CaliforniumClientEndpointFactory.java | 8 +- .../CaliforniumClientEndpointsProvider.java | 8 +- .../endpoint/ClientCoapMessageTranslator.java | 18 ++--- .../endpoint/ClientProtocolProvider.java | 2 +- .../endpoint/ServerIdentityExtractor.java | 2 +- .../coap/CoapClientEndpointFactory.java | 14 ++-- .../coap/CoapClientProtocolProvider.java | 6 +- .../coap/CoapOscoreClientEndpointFactory.java | 12 +-- .../coap/CoapOscoreProtocolProvider.java | 4 +- .../coaps/CoapsClientEndpointFactory.java | 16 ++-- .../coaps/CoapsClientProtocolProvider.java | 8 +- .../client/object/InstanceRemovedFilter.java | 2 +- .../client/object/ObjectResource.java | 10 +-- .../client/object/ResourceObserveFilter.java | 2 +- .../client/request/CoapRequestBuilder.java | 4 +- .../client/request/LwM2mResponseBuilder.java | 4 +- leshan-tl-cf-server-coap/pom.xml | 10 +-- .../californium/server/ConnectionCleaner.java | 2 +- .../californium/server/LwM2mOscoreStore.java | 6 +- .../californium/server/LwM2mPskStore.java | 2 +- .../server/OscoreContextCleaner.java | 2 +- .../californium/server/RootResource.java | 2 +- .../BootstrapOscoreContextCleaner.java | 2 +- .../server/bootstrap/BootstrapResource.java | 8 +- .../bootstrap/LwM2mBootstrapOscoreStore.java | 6 +- .../bootstrap/LwM2mBootstrapPskStore.java | 2 +- .../bootstrap/OscoreBootstrapListener.java | 2 +- .../BootstrapServerCoapMessageTranslator.java | 12 +-- .../BootstrapServerProtocolProvider.java | 2 +- .../CaliforniumBootstrapServerEndpoint.java | 10 +-- ...forniumBootstrapServerEndpointFactory.java | 6 +- ...rniumBootstrapServerEndpointsProvider.java | 14 ++-- .../CoapBootstrapServerEndpointFactory.java | 12 +-- ...BootstrapServerEndpointFactoryBuilder.java | 6 +- .../CoapBootstrapServerProtocolProvider.java | 6 +- ...pOscoreBootstrapServerEndpointFactory.java | 12 +-- .../CoapsBootstrapServerEndpointFactory.java | 14 ++-- ...BootstrapServerEndpointFactoryBuilder.java | 4 +- .../CoapsBootstrapServerProtocolProvider.java | 6 +- .../bootstrap/request/CoapRequestBuilder.java | 4 +- .../request/LwM2mResponseBuilder.java | 4 +- .../AbstractEndpointFactoryBuilder.java | 2 +- .../endpoint/CaliforniumServerEndpoint.java | 10 +-- .../CaliforniumServerEndpointFactory.java | 6 +- .../CaliforniumServerEndpointsProvider.java | 14 ++-- .../endpoint/ServerCoapMessageTranslator.java | 16 ++-- .../endpoint/ServerProtocolProvider.java | 2 +- .../coap/CoapOscoreServerEndpointFactory.java | 10 +-- .../coap/CoapServerEndpointFactory.java | 16 ++-- .../CoapServerEndpointFactoryBuilder.java | 4 +- .../coap/CoapServerProtocolProvider.java | 6 +- .../coaps/CoapsServerEndpointFactory.java | 20 ++--- .../CoapsServerEndpointFactoryBuilder.java | 4 +- .../coaps/CoapsServerProtocolProvider.java | 6 +- .../observation/EndpointContextSerDes.java | 2 +- .../observation/LwM2mObservationStore.java | 4 +- .../server/observation/ObservationSerDes.java | 2 +- .../server/registration/RegisterResource.java | 8 +- .../server/request/CoapRequestBuilder.java | 6 +- .../server/request/CoapRequestSetter.java | 2 +- .../server/request/LwM2mResponseBuilder.java | 6 +- .../californium/server/send/SendResource.java | 8 +- .../californium/server/DummyDecoder.java | 2 +- .../server/LeshanServerBuilderTest.java | 10 +-- .../californium/server/LeshanServerTest.java | 6 +- .../LeshanBootstrapServerBuilderTest.java | 10 +-- .../bootstrap/LeshanBootstrapServerTest.java | 4 +- .../LwM2mObservationStoreTest.java | 4 +- .../observation/ObservationServiceTest.java | 2 +- .../server/observation/ObserveUtilTest.java | 4 +- .../request/CoapRequestBuilderTest.java | 6 +- .../request/LwM2mResponseBuilderTest.java | 6 +- leshan-tl-cf-shared/pom.xml | 8 +- .../californium/AbstractRequestObserver.java | 2 +- .../californium/AsyncRequestObserver.java | 2 +- .../californium/CoapAsyncRequestObserver.java | 2 +- .../californium/CoapResponseCallback.java | 2 +- .../californium/CoapSyncRequestObserver.java | 2 +- .../DefaultExceptionTranslator.java | 2 +- .../californium/ExceptionTranslator.java | 2 +- .../californium/LwM2mCoapResource.java | 6 +- .../Lwm2mEndpointContextMatcher.java | 2 +- .../transport/californium/ObserveUtil.java | 2 +- .../PrincipalMdcConnectionListener.java | 2 +- .../californium/ResponseCodeUtil.java | 2 +- .../californium/SyncRequestObserver.java | 2 +- .../identity/DefaultCoapIdentityHandler.java | 2 +- .../californium/identity/IdentityHandler.java | 2 +- .../identity/IdentityHandlerProvider.java | 2 +- .../oscore/cf/InMemoryOscoreContextDB.java | 2 +- .../oscore/cf/OscoreParameters.java | 2 +- .../californium/oscore/cf/OscoreStore.java | 2 +- .../oscore/cf/StaticOscoreStore.java | 2 +- .../security/LwM2mCertificateVerifier.java | 2 +- .../californium/ResponseCodeUtilTest.java | 2 +- leshan-tl-jc-client-coap/pom.xml | 10 +-- leshan-tl-jc-client-coaptcp/pom.xml | 10 +-- leshan-tl-jc-server-coap/pom.xml | 10 +-- leshan-tl-jc-server-coaptcp/pom.xml | 10 +-- leshan-tl-jc-shared/pom.xml | 8 +- pom.xml | 69 +++++++++-------- 243 files changed, 800 insertions(+), 779 deletions(-) diff --git a/.gitignore b/.gitignore index 7167917896..81f2b006b0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ # Leshan config files # -leshan-core/ddffiles +leshan-lwm2m-core/ddffiles **/Californium.properties **/Californium3.properties **/Californium3.bsserver.properties diff --git a/.jenkins/ci.jenkins b/.jenkins/ci.jenkins index c9f527c971..d9f67f9ff3 100644 --- a/.jenkins/ci.jenkins +++ b/.jenkins/ci.jenkins @@ -27,9 +27,9 @@ pipeline { sh ''' mvn -B clean install javadoc:javadoc -PeclipseJenkins ''' } // Copy artifacts - sh ''' cp leshan-server-demo/target/leshan-server-demo-*-jar-with-dependencies.jar leshan-server-demo.jar - cp leshan-bsserver-demo/target/leshan-bsserver-demo-*-jar-with-dependencies.jar leshan-bsserver-demo.jar - cp leshan-client-demo/target/leshan-client-demo-*-jar-with-dependencies.jar leshan-client-demo.jar + sh ''' cp leshan-demo-server/target/leshan-demo-server-*-jar-with-dependencies.jar leshan-demo-server.jar + cp leshan-demo-bsserver/target/leshan-demo-bsserver-*-jar-with-dependencies.jar leshan-demo-bsserver.jar + cp leshan-demo-client/target/leshan-demo-client-*-jar-with-dependencies.jar leshan-demo-client.jar ''' } } @@ -47,7 +47,7 @@ pipeline { } always { junit '**/target/surefire-reports/*.xml' - archiveArtifacts artifacts: 'leshan-server-demo.jar,leshan-bsserver-demo.jar,leshan-client-demo.jar' + archiveArtifacts artifacts: 'leshan-demo-server.jar,leshan-demo-bsserver.jar,leshan-demo-client.jar' } } } diff --git a/.jenkins/test.jenkins b/.jenkins/test.jenkins index 5e95d26ecf..93c01d5f70 100644 --- a/.jenkins/test.jenkins +++ b/.jenkins/test.jenkins @@ -67,9 +67,9 @@ pipeline { ''' // Copy artifacts - sh ''' cp leshan-server-demo/target/leshan-server-demo-*-jar-with-dependencies.jar leshan-server-demo.jar - cp leshan-bsserver-demo/target/leshan-bsserver-demo-*-jar-with-dependencies.jar leshan-bsserver-demo.jar - cp leshan-client-demo/target/leshan-client-demo-*-jar-with-dependencies.jar leshan-client-demo.jar + sh ''' cp leshan-demo-server/target/leshan-demo-server-*-jar-with-dependencies.jar leshan-demo-server.jar + cp leshan-demo-bsserver/target/leshan-demo-bsserver-*-jar-with-dependencies.jar leshan-demo-bsserver.jar + cp leshan-demo-client/target/leshan-demo-client-*-jar-with-dependencies.jar leshan-demo-client.jar ''' } } diff --git a/.jenkins/weekly.jenkins b/.jenkins/weekly.jenkins index 3b4e2b53b2..9d494b8de8 100644 --- a/.jenkins/weekly.jenkins +++ b/.jenkins/weekly.jenkins @@ -44,8 +44,8 @@ pipeline { // Ideally we would like to use a specific integrated tools like : https://github.com/CycloneDX/cyclonedx-node-yarn // But project is not really active and is searching for contributor : https://github.com/CycloneDX/cyclonedx-node-yarn/issues/12 // OR maybe we should move from Yarn To NPM : https://github.com/eclipse-leshan/leshan/issues/1550#issuecomment-1878802371 - sh ''' trivy fs leshan-server-demo/webapp --format cyclonedx --output leshan-server-demo/target/bom-frontend.json --include-dev-deps ''' - sh ''' trivy fs leshan-bsserver-demo/webapp --format cyclonedx --output leshan-bsserver-demo/target/bom-frontend.json --include-dev-deps ''' + sh ''' trivy fs leshan-demo-server/webapp --format cyclonedx --output leshan-demo-server/target/bom-frontend.json --include-dev-deps ''' + sh ''' trivy fs leshan-demo-bsserver/webapp --format cyclonedx --output leshan-demo-bsserver/target/bom-frontend.json --include-dev-deps ''' // check for vulnerabilities // "find" to search file diff --git a/README.md b/README.md index 129a9eb965..3ee6a712c2 100644 --- a/README.md +++ b/README.md @@ -10,8 +10,8 @@ The project also provides a client, a server and a bootstrap server demonstratio | LWM2M Version
Targeted | Leshan
Version | Minimal
Java Version | Development
State | Build Status | Standalone
Demos | | - | - | - | - | - | - | -| [v1.0.x](https://github.com/eclipse/leshan/wiki/Lightweight-M2M-Specification#lightweight-m2m-v10x) | [v1.x](https://github.com/eclipse/leshan/tree/1.x)
[Supported features](https://github.com/eclipse/leshan/wiki/LWM2M-Supported-features) | Java 7 | stable released | [jenkins-1.x](https://ci.eclipse.org/leshan/job/leshan-ci/job/1.x/) | [server-demo](https://ci.eclipse.org/leshan/job/leshan-ci/job/1.x/lastSuccessfulBuild/artifact/leshan-server-demo.jar)
[client-demo](https://ci.eclipse.org/leshan/job/leshan-ci/job/1.x/lastSuccessfulBuild/artifact/leshan-client-demo.jar)
[bsserver-demo](https://ci.eclipse.org/leshan/job/leshan-ci/job/1.x/lastSuccessfulBuild/artifact/leshan-bsserver-demo.jar) | -| [**v1.1.x**](https://github.com/eclipse/leshan/wiki/Lightweight-M2M-Specification#lightweight-m2m-v11x)| [**v2.x** (master)](https://github.com/eclipse/leshan/tree/master)
[Supported features](https://github.com/eclipse/leshan/wiki/LWM2M-1.1-supported-features) | Java 8 | **in development** |[jenkins-master](https://ci.eclipse.org/leshan/job/leshan-ci/job/master/) | [server-demo](https://ci.eclipse.org/leshan/job/leshan-ci/job/master/lastSuccessfulBuild/artifact/leshan-server-demo.jar)
[client-demo](https://ci.eclipse.org/leshan/job/leshan-ci/job/master/lastSuccessfulBuild/artifact/leshan-client-demo.jar)
[bsserver-demo](https://ci.eclipse.org/leshan/job/leshan-ci/job/master/lastSuccessfulBuild/artifact/leshan-bsserver-demo.jar) | +| [v1.0.x](https://github.com/eclipse/leshan/wiki/Lightweight-M2M-Specification#lightweight-m2m-v10x) | [v1.x](https://github.com/eclipse/leshan/tree/1.x)
[Supported features](https://github.com/eclipse/leshan/wiki/LWM2M-Supported-features) | Java 7 | stable released | [jenkins-1.x](https://ci.eclipse.org/leshan/job/leshan-ci/job/1.x/) | [server-demo](https://ci.eclipse.org/leshan/job/leshan-ci/job/1.x/lastSuccessfulBuild/artifact/leshan-demo-server.jar)
[client-demo](https://ci.eclipse.org/leshan/job/leshan-ci/job/1.x/lastSuccessfulBuild/artifact/leshan-demo-client.jar)
[bsserver-demo](https://ci.eclipse.org/leshan/job/leshan-ci/job/1.x/lastSuccessfulBuild/artifact/leshan-demo-bsserver.jar) | +| [**v1.1.x**](https://github.com/eclipse/leshan/wiki/Lightweight-M2M-Specification#lightweight-m2m-v11x)| [**v2.x** (master)](https://github.com/eclipse/leshan/tree/master)
[Supported features](https://github.com/eclipse/leshan/wiki/LWM2M-1.1-supported-features) | Java 8 | **in development** |[jenkins-master](https://ci.eclipse.org/leshan/job/leshan-ci/job/master/) | [server-demo](https://ci.eclipse.org/leshan/job/leshan-ci/job/master/lastSuccessfulBuild/artifact/leshan-demo-server.jar)
[client-demo](https://ci.eclipse.org/leshan/job/leshan-ci/job/master/lastSuccessfulBuild/artifact/leshan-demo-client.jar)
[bsserver-demo](https://ci.eclipse.org/leshan/job/leshan-ci/job/master/lastSuccessfulBuild/artifact/leshan-demo-bsserver.jar) | Release (stable and milestones) are available on [maven central](https://search.maven.org/search?q=org.eclipse.leshan). @@ -51,18 +51,18 @@ Test Leshan Demos locally ----------------------- Get and run the last binary of our demo **server** : ``` -wget https://ci.eclipse.org/leshan/job/leshan-ci/job/master/lastSuccessfulBuild/artifact/leshan-server-demo.jar -java -jar ./leshan-server-demo.jar +wget https://ci.eclipse.org/leshan/job/leshan-ci/job/master/lastSuccessfulBuild/artifact/leshan-demo-server.jar +java -jar ./leshan-demo-server.jar ``` Get and run the last binary of our demo **client** : ``` -wget https://ci.eclipse.org/leshan/job/leshan-ci/job/master/lastSuccessfulBuild/artifact/leshan-client-demo.jar -java -jar ./leshan-client-demo.jar +wget https://ci.eclipse.org/leshan/job/leshan-ci/job/master/lastSuccessfulBuild/artifact/leshan-demo-client.jar +java -jar ./leshan-demo-client.jar ``` Get and run the last binary of our **bootstrap** demo server : ``` -wget https://ci.eclipse.org/leshan/job/leshan-ci/job/master/lastSuccessfulBuild/artifact/leshan-bsserver-demo.jar -java -jar ./leshan-bsserver-demo.jar +wget https://ci.eclipse.org/leshan/job/leshan-ci/job/master/lastSuccessfulBuild/artifact/leshan-demo-bsserver.jar +java -jar ./leshan-demo-bsserver.jar ``` :information_source: : _All the demos have a `--help` option._ @@ -88,7 +88,7 @@ mvn clean install Run demo **server**: ``` -java -jar leshan-server-demo/target/leshan-server-demo-*-SNAPSHOT-jar-with-dependencies.jar +java -jar leshan-demo-server/target/leshan-demo-server-*-SNAPSHOT-jar-with-dependencies.jar ``` Connect on Leshan demo UI: http://localhost:8080 @@ -96,13 +96,13 @@ Leshan server Demo provides a very simple UI to get the list of connected client Now you can register a LWM2M client by running our **client** demo: ``` -java -jar leshan-client-demo/target/leshan-client-demo-*-SNAPSHOT-jar-with-dependencies.jar +java -jar leshan-demo-client/target/leshan-demo-client-*-SNAPSHOT-jar-with-dependencies.jar ``` or trying the [Eclipse Wakaama](http://eclipse.org/wakaama) test client. You can also try our **bootstrap** demo server: ``` -java -jar leshan-bsserver-demo/target/leshan-bsserver-demo-*-SNAPSHOT-jar-with-dependencies.jar +java -jar leshan-demo-bsserver/target/leshan-demo-bsserver-*-SNAPSHOT-jar-with-dependencies.jar ``` Let's start to code ! diff --git a/SECURITY.md b/SECURITY.md index 0f85ffd952..6696c8595a 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -2,73 +2,76 @@ ## Reporting a Vulnerability -To report a Security issue, you can : -- (**Preferred way ⭐**) create a new [Github Security Advisories](https://docs.github.com/en/code-security/security-advisories/repository-security-advisories/about-repository-security-advisories), using [this form](https://github.com/eclipse-leshan/leshan/security/advisories/new), - - open a [gitlab issue](https://gitlab.eclipse.org/security/vulnerability-reports/-/issues/new?issuable_template=new_vulnerability), - - send an email to security@eclipse-foundation.org. +To report a Security issue, you can : + +- (**Preferred way ⭐**) create a new [Github Security Advisories](https://docs.github.com/en/code-security/security-advisories/repository-security-advisories/about-repository-security-advisories), using [this form](https://github.com/eclipse-leshan/leshan/security/advisories/new), +- open a [gitlab issue](https://gitlab.eclipse.org/security/vulnerability-reports/-/issues/new?issuable_template=new_vulnerability), +- send an email to security@eclipse-foundation.org. For more details, please look at : - - https://www.eclipse.org/security/ - - https://www.eclipse.org/projects/handbook/#vulnerability + +- https://www.eclipse.org/security/ +- https://www.eclipse.org/projects/handbook/#vulnerability ## Supported Versions -Only Leshan library is concerned. The demos are not covered. +Only Leshan library is concerned. The demos are not covered. | Version | Supported | -| ------- | ------------------ | -| 2.x | :heavy_check_mark: | | -| 1.x | :heavy_check_mark: | +| ------- | ------------------ | --- | +| 2.x | :heavy_check_mark: | | +| 1.x | :heavy_check_mark: | -Note: ℹ️ **1.x** version depends on californium 2.x version where support is not clear. +Note: ℹ️ **1.x** version depends on californium 2.x version where support is not clear. See : https://github.com/eclipse/californium/security/policy ## About Leshan Demo As said previously **Leshan demos are not covered by Security Policy**. -It is strongly discouraged to use Leshan demos v1.x on public server because they are using no longer maintained javascript library like : +It is strongly discouraged to use Leshan demos v1.x on public server because they are using no longer maintained javascript library like : + - **bootstrap.js** (pkg:javascript/bootstrap@3.4.1) : Bootstrap before 4.0.0 is end-of-life and no longer maintained. - **jquery-2.2.4.js** (pkg:javascript/jquery@2.2.4) : CVE-2015-9251, CVE-2019-11358, CVE-2020-11022, CVE-2020-11023, jQuery 1.x and 2.x are End-of-Life and no longer receiving security updates -Concerning Leshan demos v2.x, some minimal efforts are made to update dependencies when vulnerabilities are detected but keep in mind that demos are not production ready tools. +Concerning Leshan demos v2.x, some minimal efforts are made to update dependencies when vulnerabilities are detected but keep in mind that demos are not production ready tools. ## Versions Security State -List of version which are not affected by known vulnerability. +List of version which are not affected by known vulnerability. -| Version | | -| -------------------- | ------------------ | -| 2.0.0-M13 + | :heavy_check_mark: | -| 1.5.0 + | :heavy_check_mark: | +| Version | | +| ----------- | ------------------ | +| 2.0.0-M13 + | :heavy_check_mark: | +| 1.5.0 + | :heavy_check_mark: | This is an exhaustive list of known security issue affecting leshan library : -| CVE/ID | Leshan version concerned | artifacts | Affect | -| ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| ---------------------------------------- | ---------------------| ------ | -| [CVE-2023-41034](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2023-41034)
[GHSA-wc9j-gc65-3cm7](https://github.com/eclipse-leshan/leshan/security/advisories/GHSA-wc9j-gc65-3cm7) | 2.0.0-M1 -> 2.0.0-M12
1.0.0 -> 1.4.2| leshan-core | if you parse untrusted DDF files
(e.g. if they let external users provide their own model), | - +| CVE/ID | Leshan version concerned | artifacts | Affect | +| -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------- | ----------------- | ------------------------------------------------------------------------------------------------ | +| [CVE-2023-41034](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2023-41034)
[GHSA-wc9j-gc65-3cm7](https://github.com/eclipse-leshan/leshan/security/advisories/GHSA-wc9j-gc65-3cm7) | 2.0.0-M1 -> 2.0.0-M12
1.0.0 -> 1.4.2 | leshan-lwm2m-core | if you parse untrusted DDF files
(e.g. if they let external users provide their own model), | This is a not exhaustive list of security issue from Leshan dependencies which could affect Leshan : -| CVE/ID | Leshan version concerned | Source | Affect | -| --------------------------------------------------------------------------------------------------------| ---------------------------------------- | ---------------------| ------ | -| [CVE-2022-39368](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-39368) | 2.0.0-M1 -> 2.0.0-M8
1.0.0 -> 1.4.1 | californium/scandium | any DTLS usage | -| [CVE-2022-2576](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-2576) | 2.0.0-M1 -> 2.0.0-M7
1.0.0 -> 1.4.0 | californium/scandium | DTLS_VERIFY_PEERS_ ON_RESUMPTION_THRESHOLD > 0 | -| [GHSA-fj2w-wfgv-mwq6](https://github.com/peteroupc/CBOR-Java/security/advisories/GHSA-fj2w-wfgv-mwq6) | 2.0.0-M2 -> 2.0.0-M4 | com.upokecenter.cbor | CBOR or SenML-CBOR decoding | -| [CVE-2020-27222](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-27222) | 1.1.0 -> 1.3.1 | californium/scandium | DTLS with x509 and/or RPK | -| [CVE-2021-34433](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-34433) | 2.0.0-M1 -> 2.0.0-M4
1.0.0 -> 1.3.1 | californium/scandium | DTLS with x509 and/or RPK | +| CVE/ID | Leshan version concerned | Source | Affect | +| ----------------------------------------------------------------------------------------------------- | ---------------------------------------- | -------------------- | ---------------------------------------------- | +| [CVE-2022-39368](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-39368) | 2.0.0-M1 -> 2.0.0-M8
1.0.0 -> 1.4.1 | californium/scandium | any DTLS usage | +| [CVE-2022-2576](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-2576) | 2.0.0-M1 -> 2.0.0-M7
1.0.0 -> 1.4.0 | californium/scandium | DTLS*VERIFY_PEERS* ON_RESUMPTION_THRESHOLD > 0 | +| [GHSA-fj2w-wfgv-mwq6](https://github.com/peteroupc/CBOR-Java/security/advisories/GHSA-fj2w-wfgv-mwq6) | 2.0.0-M2 -> 2.0.0-M4 | com.upokecenter.cbor | CBOR or SenML-CBOR decoding | +| [CVE-2020-27222](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-27222) | 1.1.0 -> 1.3.1 | californium/scandium | DTLS with x509 and/or RPK | +| [CVE-2021-34433](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-34433) | 2.0.0-M1 -> 2.0.0-M4
1.0.0 -> 1.3.1 | californium/scandium | DTLS with x509 and/or RPK | Note: We strongly encourage you to switch last safe Leshan version, but for vulnerability caused by a dependency : - - if there isn't Leshan release available OR if you want to be very conservative - - AND the concerned library is using [semantic versioning](https://semver.org/) - -then you could try to just update the dependency to a safe compatible version without upgrading Leshan. + +- if there isn't Leshan release available OR if you want to be very conservative +- AND the concerned library is using [semantic versioning](https://semver.org/) + +then you could try to just update the dependency to a safe compatible version without upgrading Leshan. ## Runtime Security State This is a not exhaustive list of JVM security issue which could affect common Leshan usages. -| Dependency | Affected Version | Usage | Vulnerability | More Information | -| ---------- | ---------------- | ----- | ------------- | ---------------- | -| JDK / JCE | <= 15.0.2?
<= 16.0.2?
< 17.0.3
< 18.0.1 | Cipher Suite based on ECDSA | ECDSA [CVE-2022-21449](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-21449) | https://github.com/eclipse/leshan/issues/1243 | +| Dependency | Affected Version | Usage | Vulnerability | More Information | +| ---------- | --------------------------------------------------------- | --------------------------- | ------------------------------------------------------------------------------------- | --------------------------------------------- | +| JDK / JCE | <= 15.0.2?
<= 16.0.2?
< 17.0.3
< 18.0.1 | Cipher Suite based on ECDSA | ECDSA [CVE-2022-21449](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-21449) | https://github.com/eclipse/leshan/issues/1243 | diff --git a/build-config/lib-build-config/pom.xml b/build-config/lib-build-config/pom.xml index 6e5e1c6ed6..c6f3883fcf 100644 --- a/build-config/lib-build-config/pom.xml +++ b/build-config/lib-build-config/pom.xml @@ -88,29 +88,38 @@ Contributors: java-package /org\.eclipse\.californium(\..*)?/ - - java-package /org\.slf4j(\..*)?/ - + java-package /com\.mbed\.coap(\..*)?/ - java-package /io\.netty(\..*)?/ + + java-package + /com\.upokecenter(\..*)?/ + + + java-package + /com\.fasterxml\.jackson(\..*)?/ + + + java-package + /redis\.clients\.jedis(\..*)?/ + + + java-package + /org\.eclipse\.californium(\..*)?/ + diff --git a/leshan-demo-bsserver/logback-config.xml b/leshan-demo-bsserver/logback-config.xml index 3c737a4860..e805621d8b 100644 --- a/leshan-demo-bsserver/logback-config.xml +++ b/leshan-demo-bsserver/logback-config.xml @@ -15,9 +15,9 @@ Contributors: Sierra Wireless - initial API and implementation --> - + - + %gray(%d) %gray(%-25logger{0}) [%highlight(%p)] %m %yellow(%X) %n @@ -28,8 +28,8 @@ Contributors: - - + + \ No newline at end of file diff --git a/leshan-demo-bsserver/pom.xml b/leshan-demo-bsserver/pom.xml index c0b05c3c3c..4fcac025ff 100644 --- a/leshan-demo-bsserver/pom.xml +++ b/leshan-demo-bsserver/pom.xml @@ -24,22 +24,22 @@ Contributors: 2.0.0-SNAPSHOT ../build-config/demo-build-config/pom.xml - leshan-bsserver-demo - leshan - bootstrap server demo + leshan-demo-bsserver + leshan - demo - bsserver A LWM2M bootstrap demonstration server running an embedded Jetty server org.eclipse.leshan - leshan-server-cf + leshan-tl-cf-server-coap org.eclipse.leshan - leshan-core-demo + leshan-demo-shared org.eclipse.leshan - leshan-server-core-demo + leshan-demo-servers-shared @@ -69,7 +69,7 @@ Contributors: - org.eclipse.leshan.server.bootstrap.demo.LeshanBootstrapServerDemo + org.eclipse.leshan.demo.bsserver.LeshanBootstrapServerDemo diff --git a/leshan-demo-bsserver/src/main/java/org/eclipse/leshan/demo/bsserver/JSONFileBootstrapStore.java b/leshan-demo-bsserver/src/main/java/org/eclipse/leshan/demo/bsserver/JSONFileBootstrapStore.java index c96b43dbe2..7616785c2c 100644 --- a/leshan-demo-bsserver/src/main/java/org/eclipse/leshan/demo/bsserver/JSONFileBootstrapStore.java +++ b/leshan-demo-bsserver/src/main/java/org/eclipse/leshan/demo/bsserver/JSONFileBootstrapStore.java @@ -15,7 +15,7 @@ * Achim Kraus (Bosch Software Innovations GmbH) - add json as storage format * Orange - keep one JSON dependency *******************************************************************************/ -package org.eclipse.leshan.server.bootstrap.demo; +package org.eclipse.leshan.demo.bsserver; import java.io.File; import java.io.FileInputStream; @@ -29,13 +29,13 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; import org.eclipse.leshan.core.util.Validate; +import org.eclipse.leshan.demo.bsserver.json.ByteArraySerializer; +import org.eclipse.leshan.demo.bsserver.json.EnumSetDeserializer; +import org.eclipse.leshan.demo.bsserver.json.EnumSetSerializer; import org.eclipse.leshan.server.bootstrap.BootstrapConfig; import org.eclipse.leshan.server.bootstrap.EditableBootstrapConfigStore; import org.eclipse.leshan.server.bootstrap.InMemoryBootstrapConfigStore; import org.eclipse.leshan.server.bootstrap.InvalidConfigurationException; -import org.eclipse.leshan.server.bootstrap.demo.json.ByteArraySerializer; -import org.eclipse.leshan.server.bootstrap.demo.json.EnumSetDeserializer; -import org.eclipse.leshan.server.bootstrap.demo.json.EnumSetSerializer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/leshan-demo-bsserver/src/main/java/org/eclipse/leshan/demo/bsserver/LeshanBootstrapServerDemo.java b/leshan-demo-bsserver/src/main/java/org/eclipse/leshan/demo/bsserver/LeshanBootstrapServerDemo.java index 4e01aaff1e..78d310ae53 100755 --- a/leshan-demo-bsserver/src/main/java/org/eclipse/leshan/demo/bsserver/LeshanBootstrapServerDemo.java +++ b/leshan-demo-bsserver/src/main/java/org/eclipse/leshan/demo/bsserver/LeshanBootstrapServerDemo.java @@ -16,7 +16,7 @@ * configuration filename *******************************************************************************/ -package org.eclipse.leshan.server.bootstrap.demo; +package org.eclipse.leshan.demo.bsserver; import java.io.File; import java.io.PrintWriter; @@ -31,28 +31,28 @@ import org.eclipse.jetty.servlet.DefaultServlet; import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.servlet.ServletHolder; -import org.eclipse.leshan.core.californium.PrincipalMdcConnectionListener; -import org.eclipse.leshan.core.demo.cli.ShortErrorMessageHandler; import org.eclipse.leshan.core.endpoint.EndpointUriUtil; import org.eclipse.leshan.core.endpoint.Protocol; import org.eclipse.leshan.core.model.ObjectLoader; import org.eclipse.leshan.core.model.ObjectModel; +import org.eclipse.leshan.demo.bsserver.cli.LeshanBsServerDemoCLI; +import org.eclipse.leshan.demo.bsserver.servlet.BootstrapServlet; +import org.eclipse.leshan.demo.bsserver.servlet.EventServlet; +import org.eclipse.leshan.demo.bsserver.servlet.ServerServlet; +import org.eclipse.leshan.demo.cli.ShortErrorMessageHandler; +import org.eclipse.leshan.demo.servers.json.servlet.SecurityServlet; import org.eclipse.leshan.server.bootstrap.EditableBootstrapConfigStore; import org.eclipse.leshan.server.bootstrap.LeshanBootstrapServer; import org.eclipse.leshan.server.bootstrap.LeshanBootstrapServerBuilder; -import org.eclipse.leshan.server.bootstrap.demo.cli.LeshanBsServerDemoCLI; -import org.eclipse.leshan.server.bootstrap.demo.servlet.BootstrapServlet; -import org.eclipse.leshan.server.bootstrap.demo.servlet.EventServlet; -import org.eclipse.leshan.server.bootstrap.demo.servlet.ServerServlet; -import org.eclipse.leshan.server.californium.bootstrap.endpoint.CaliforniumBootstrapServerEndpointsProvider; -import org.eclipse.leshan.server.californium.bootstrap.endpoint.coap.CoapBootstrapServerProtocolProvider; -import org.eclipse.leshan.server.californium.bootstrap.endpoint.coap.CoapOscoreBootstrapServerEndpointFactory; -import org.eclipse.leshan.server.californium.bootstrap.endpoint.coaps.CoapsBootstrapServerProtocolProvider; -import org.eclipse.leshan.server.core.demo.json.servlet.SecurityServlet; import org.eclipse.leshan.server.model.VersionedBootstrapModelProvider; import org.eclipse.leshan.server.security.BootstrapSecurityStoreAdapter; import org.eclipse.leshan.server.security.EditableSecurityStore; import org.eclipse.leshan.server.security.FileSecurityStore; +import org.eclipse.leshan.transport.californium.PrincipalMdcConnectionListener; +import org.eclipse.leshan.transport.californium.server.bootstrap.endpoint.CaliforniumBootstrapServerEndpointsProvider; +import org.eclipse.leshan.transport.californium.server.bootstrap.endpoint.coap.CoapBootstrapServerProtocolProvider; +import org.eclipse.leshan.transport.californium.server.bootstrap.endpoint.coap.CoapOscoreBootstrapServerEndpointFactory; +import org.eclipse.leshan.transport.californium.server.bootstrap.endpoint.coaps.CoapsBootstrapServerProtocolProvider; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/leshan-demo-bsserver/src/main/java/org/eclipse/leshan/demo/bsserver/cli/LeshanBsServerDemoCLI.java b/leshan-demo-bsserver/src/main/java/org/eclipse/leshan/demo/bsserver/cli/LeshanBsServerDemoCLI.java index d71a388486..c31aa07600 100644 --- a/leshan-demo-bsserver/src/main/java/org/eclipse/leshan/demo/bsserver/cli/LeshanBsServerDemoCLI.java +++ b/leshan-demo-bsserver/src/main/java/org/eclipse/leshan/demo/bsserver/cli/LeshanBsServerDemoCLI.java @@ -13,14 +13,14 @@ * Contributors: * Sierra Wireless - initial API and implementation *******************************************************************************/ -package org.eclipse.leshan.server.bootstrap.demo.cli; +package org.eclipse.leshan.demo.bsserver.cli; -import org.eclipse.leshan.core.demo.cli.StandardHelpOptions; -import org.eclipse.leshan.core.demo.cli.VersionProvider; -import org.eclipse.leshan.server.bootstrap.demo.JSONFileBootstrapStore; -import org.eclipse.leshan.server.core.demo.cli.DtlsSection; -import org.eclipse.leshan.server.core.demo.cli.GeneralSection; -import org.eclipse.leshan.server.core.demo.cli.IdentitySection; +import org.eclipse.leshan.demo.bsserver.JSONFileBootstrapStore; +import org.eclipse.leshan.demo.cli.StandardHelpOptions; +import org.eclipse.leshan.demo.cli.VersionProvider; +import org.eclipse.leshan.demo.servers.cli.DtlsSection; +import org.eclipse.leshan.demo.servers.cli.GeneralSection; +import org.eclipse.leshan.demo.servers.cli.IdentitySection; import picocli.CommandLine.ArgGroup; import picocli.CommandLine.Command; @@ -32,7 +32,7 @@ /** * This is the class defining the Command Line Interface of Leshan Server Demo. */ -@Command(name = "leshan-bsserver-demo", +@Command(name = "leshan-demo-bsserver", sortOptions = false, description = "%n"// + "@|italic " // diff --git a/leshan-demo-bsserver/src/main/java/org/eclipse/leshan/demo/bsserver/json/ByteArraySerializer.java b/leshan-demo-bsserver/src/main/java/org/eclipse/leshan/demo/bsserver/json/ByteArraySerializer.java index 5bd83eea2f..38a1a16fe8 100644 --- a/leshan-demo-bsserver/src/main/java/org/eclipse/leshan/demo/bsserver/json/ByteArraySerializer.java +++ b/leshan-demo-bsserver/src/main/java/org/eclipse/leshan/demo/bsserver/json/ByteArraySerializer.java @@ -13,7 +13,7 @@ * Contributors: * Orange - keep one JSON dependency *******************************************************************************/ -package org.eclipse.leshan.server.bootstrap.demo.json; +package org.eclipse.leshan.demo.bsserver.json; import java.io.IOException; diff --git a/leshan-demo-bsserver/src/main/java/org/eclipse/leshan/demo/bsserver/json/EnumSetBindingModeDeserializer.java b/leshan-demo-bsserver/src/main/java/org/eclipse/leshan/demo/bsserver/json/EnumSetBindingModeDeserializer.java index 71eb73d312..de3aa7b1bb 100644 --- a/leshan-demo-bsserver/src/main/java/org/eclipse/leshan/demo/bsserver/json/EnumSetBindingModeDeserializer.java +++ b/leshan-demo-bsserver/src/main/java/org/eclipse/leshan/demo/bsserver/json/EnumSetBindingModeDeserializer.java @@ -13,7 +13,7 @@ * Contributors: * Orange - keep one JSON dependency *******************************************************************************/ -package org.eclipse.leshan.server.bootstrap.demo.json; +package org.eclipse.leshan.demo.bsserver.json; import java.io.IOException; import java.util.EnumSet; diff --git a/leshan-demo-bsserver/src/main/java/org/eclipse/leshan/demo/bsserver/json/EnumSetDeserializer.java b/leshan-demo-bsserver/src/main/java/org/eclipse/leshan/demo/bsserver/json/EnumSetDeserializer.java index ab04809d54..f6772cb6cb 100644 --- a/leshan-demo-bsserver/src/main/java/org/eclipse/leshan/demo/bsserver/json/EnumSetDeserializer.java +++ b/leshan-demo-bsserver/src/main/java/org/eclipse/leshan/demo/bsserver/json/EnumSetDeserializer.java @@ -13,7 +13,7 @@ * Contributors: * Orange - keep one JSON dependency *******************************************************************************/ -package org.eclipse.leshan.server.bootstrap.demo.json; +package org.eclipse.leshan.demo.bsserver.json; import java.util.EnumSet; diff --git a/leshan-demo-bsserver/src/main/java/org/eclipse/leshan/demo/bsserver/json/EnumSetSerializer.java b/leshan-demo-bsserver/src/main/java/org/eclipse/leshan/demo/bsserver/json/EnumSetSerializer.java index 11338aaa3c..0775b7d377 100644 --- a/leshan-demo-bsserver/src/main/java/org/eclipse/leshan/demo/bsserver/json/EnumSetSerializer.java +++ b/leshan-demo-bsserver/src/main/java/org/eclipse/leshan/demo/bsserver/json/EnumSetSerializer.java @@ -13,7 +13,7 @@ * Contributors: * Orange - keep one JSON dependency *******************************************************************************/ -package org.eclipse.leshan.server.bootstrap.demo.json; +package org.eclipse.leshan.demo.bsserver.json; import java.io.IOException; import java.util.EnumSet; diff --git a/leshan-demo-bsserver/src/main/java/org/eclipse/leshan/demo/bsserver/servlet/BootstrapServlet.java b/leshan-demo-bsserver/src/main/java/org/eclipse/leshan/demo/bsserver/servlet/BootstrapServlet.java index 4e07156f19..cfdb5131cf 100644 --- a/leshan-demo-bsserver/src/main/java/org/eclipse/leshan/demo/bsserver/servlet/BootstrapServlet.java +++ b/leshan-demo-bsserver/src/main/java/org/eclipse/leshan/demo/bsserver/servlet/BootstrapServlet.java @@ -15,7 +15,7 @@ * Orange - keep one JSON dependency *******************************************************************************/ -package org.eclipse.leshan.server.bootstrap.demo.servlet; +package org.eclipse.leshan.demo.bsserver.servlet; import java.io.IOException; import java.io.InputStreamReader; @@ -28,12 +28,12 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.lang.StringUtils; +import org.eclipse.leshan.demo.bsserver.json.ByteArraySerializer; +import org.eclipse.leshan.demo.bsserver.json.EnumSetDeserializer; +import org.eclipse.leshan.demo.bsserver.json.EnumSetSerializer; import org.eclipse.leshan.server.bootstrap.BootstrapConfig; import org.eclipse.leshan.server.bootstrap.EditableBootstrapConfigStore; import org.eclipse.leshan.server.bootstrap.InvalidConfigurationException; -import org.eclipse.leshan.server.bootstrap.demo.json.ByteArraySerializer; -import org.eclipse.leshan.server.bootstrap.demo.json.EnumSetDeserializer; -import org.eclipse.leshan.server.bootstrap.demo.json.EnumSetSerializer; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.core.JsonParseException; diff --git a/leshan-demo-bsserver/src/main/java/org/eclipse/leshan/demo/bsserver/servlet/EventServlet.java b/leshan-demo-bsserver/src/main/java/org/eclipse/leshan/demo/bsserver/servlet/EventServlet.java index 3659cadffb..f95d8f098f 100644 --- a/leshan-demo-bsserver/src/main/java/org/eclipse/leshan/demo/bsserver/servlet/EventServlet.java +++ b/leshan-demo-bsserver/src/main/java/org/eclipse/leshan/demo/bsserver/servlet/EventServlet.java @@ -13,7 +13,7 @@ * Contributors: * Sierra Wireless - initial API and implementation *******************************************************************************/ -package org.eclipse.leshan.server.bootstrap.demo.servlet; +package org.eclipse.leshan.demo.bsserver.servlet; import java.io.IOException; import java.util.Collections; diff --git a/leshan-demo-bsserver/src/main/java/org/eclipse/leshan/demo/bsserver/servlet/ServerServlet.java b/leshan-demo-bsserver/src/main/java/org/eclipse/leshan/demo/bsserver/servlet/ServerServlet.java index 4011af7d42..9e40bede3d 100644 --- a/leshan-demo-bsserver/src/main/java/org/eclipse/leshan/demo/bsserver/servlet/ServerServlet.java +++ b/leshan-demo-bsserver/src/main/java/org/eclipse/leshan/demo/bsserver/servlet/ServerServlet.java @@ -14,7 +14,7 @@ * Sierra Wireless - initial API and implementation * Orange - keep one JSON dependency *******************************************************************************/ -package org.eclipse.leshan.server.bootstrap.demo.servlet; +package org.eclipse.leshan.demo.bsserver.servlet; import java.io.IOException; import java.nio.charset.StandardCharsets; @@ -27,10 +27,10 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.lang.StringUtils; +import org.eclipse.leshan.demo.servers.json.PublicKeySerDes; +import org.eclipse.leshan.demo.servers.json.X509CertificateSerDes; import org.eclipse.leshan.server.bootstrap.LeshanBootstrapServer; import org.eclipse.leshan.server.bootstrap.endpoint.LwM2mBootstrapServerEndpoint; -import org.eclipse.leshan.server.core.demo.json.PublicKeySerDes; -import org.eclipse.leshan.server.core.demo.json.X509CertificateSerDes; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.JsonNodeFactory; diff --git a/leshan-demo-bsserver/src/main/resources/webapp/index.html b/leshan-demo-bsserver/src/main/resources/webapp/index.html index d6421ad4e5..7aa22e40b2 100644 --- a/leshan-demo-bsserver/src/main/resources/webapp/index.html +++ b/leshan-demo-bsserver/src/main/resources/webapp/index.html @@ -8,16 +8,16 @@

- If you are in development phase and run leshan-bsserver-demo + If you are in development phase and run leshan-demo-bsserver from your ide, you probably missed to launch yarn serve and/or you are not using the right port to access to the demo, try http://localhost:8088/ -
(see leshan-bsserver-demo +
(see leshan-demo-bsserver README for more details)

- If you are using a built version of leshan-bsserver-demo + If you are using a built version of leshan-demo-bsserver and you see this page, you probably discover a leshan built issue. Please report it. diff --git a/leshan-demo-bsserver/webapp/README.md b/leshan-demo-bsserver/webapp/README.md index 717402d590..5e92dbdc61 100644 --- a/leshan-demo-bsserver/webapp/README.md +++ b/leshan-demo-bsserver/webapp/README.md @@ -1,4 +1,4 @@ # webapp -The **leshan-bsserver-demo** webapp is based on [Vue.js](https://vuejs.org/). -For more details you should refer to **leshan-server-demo** [README](https://github.com/eclipse/leshan/tree/master/leshan-server-demo/webapp/README.md). \ No newline at end of file +The **leshan-demo-bsserver** webapp is based on [Vue.js](https://vuejs.org/). +For more details you should refer to **leshan-demo-server** [README](https://github.com/eclipse/leshan/tree/master/leshan-demo-server/webapp/README.md). \ No newline at end of file diff --git a/leshan-demo-bsserver/webapp/jsconfig.json b/leshan-demo-bsserver/webapp/jsconfig.json index 13d39470e9..1452444a07 100644 --- a/leshan-demo-bsserver/webapp/jsconfig.json +++ b/leshan-demo-bsserver/webapp/jsconfig.json @@ -2,9 +2,9 @@ "compilerOptions": { "paths": { "@/*": ["./src/*"], - "@leshan-server-core-demo/*": [ - "../../leshan-server-core-demo/webapp/src/*" + "@leshan-demo-servers-shared/*": [ + "../../leshan-demo-servers-shared/webapp/src/*" ] } } -} \ No newline at end of file +} diff --git a/leshan-demo-bsserver/webapp/package.json b/leshan-demo-bsserver/webapp/package.json index 341a782f53..133eb750ca 100644 --- a/leshan-demo-bsserver/webapp/package.json +++ b/leshan-demo-bsserver/webapp/package.json @@ -1,5 +1,5 @@ { - "name": "leshan-bsserver-demo", + "name": "leshan-demo-bsserver", "version": "0.1.0", "private": true, "type": "module", diff --git a/leshan-demo-bsserver/webapp/src/App.vue b/leshan-demo-bsserver/webapp/src/App.vue index b2fdca4697..491bfaaaeb 100644 --- a/leshan-demo-bsserver/webapp/src/App.vue +++ b/leshan-demo-bsserver/webapp/src/App.vue @@ -25,7 +25,7 @@