Update dependencies on 'dev' in qt/qtcoap

Change-Id: Iff9cf0e6781e33507641f3112518f3df13abfd65
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>

.cmake.conf

@@ -1,4 +1,4 @@
-set(QT_REPO_MODULE_VERSION "6.9.0")
+set(QT_REPO_MODULE_VERSION "6.11.0")
 set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1")
 set(QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_AS_CONST=1")
 list(APPEND QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_FOREACH=1")

.gitreview

@@ -0,0 +1,4 @@
+[gerrit]
+host=codereview.qt-project.org
+project=qt/qtcoap
+defaultbranch=dev

CMakeLists.txt

@@ -11,8 +11,18 @@ project(QtCoap
     LANGUAGES CXX
 )
 
-find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core Network)
+find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals)
-find_package(Qt6 ${PROJECT_VERSION} CONFIG OPTIONAL_COMPONENTS Gui Widgets Quick Qml)
+
+# This should be called as early as possible, just after find_package(BuildInternals) where it is
+# defined.
 qt_internal_project_setup()
 
+find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS  Core Network)
+find_package(Qt6 ${PROJECT_VERSION} CONFIG OPTIONAL_COMPONENTS Gui Widgets Quick Qml)
+
+if(NOT QT_FEATURE_udpsocket)
+    message(NOTICE "UDP socket support is required for QtCoap, skipping module")
+    return()
+endif()
+
 qt_build_repo()

REUSE.toml

@@ -1,40 +1,40 @@
 version = 1
 
 [[annotations]]
-path = [".tag", "**/.gitattributes", "**.gitignore"]
+path = ["**/.gitattributes", "**.gitignore", "**.gitreview"]
 precedence = "closest"
-SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd."
+SPDX-FileCopyrightText = "Copyright (C) The Qt Company Ltd."
-SPDX-License-Identifier = "BSD-3-Clause"
+SPDX-License-Identifier = "LicenseRef-Qt-Commercial OR BSD-3-Clause"
 
 [[annotations]]
-path = [".cmake.conf", "**.yaml", "**.json", "**.yml"]
+path = [".tag", ".cmake.conf", "**.yaml", "**.yml", "**ci_config_linux.json"]
 precedence = "closest"
 comment = "build system"
-SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd."
+SPDX-FileCopyrightText = "Copyright (C) The Qt Company Ltd."
 SPDX-License-Identifier = "BSD-3-Clause"
 
 [[annotations]]
 path = ["examples/**"]
 comment = "this must be after the build system table because example and snippets take precedence over build system"
 precedence = "closest"
-SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd."
+SPDX-FileCopyrightText = "Copyright (C) The Qt Company Ltd."
 SPDX-License-Identifier = "LicenseRef-Qt-Commercial OR BSD-3-Clause"
 
 [[annotations]]
 path = ["**/README*", "**.qdocconf", "src/coap/doc/style/style.css"]
 comment = "documentation"
 precedence = "closest"
-SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd."
+SPDX-FileCopyrightText = "Copyright (C) The Qt Company Ltd."
 SPDX-License-Identifier = "LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only"
 
 [[annotations]]
 path = ["**.toml", "licenseRule.json"]
 precedence = "override"
-SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd."
+SPDX-FileCopyrightText = "Copyright (C) The Qt Company Ltd."
-SPDX-License-Identifier = "LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only"
+SPDX-License-Identifier = "LicenseRef-Qt-Commercial OR BSD-3-Clause"
 
 [[annotations]]
-path = ["**LICENSE*", "**.pem"]
+path = ["**.pem"]
 precedence = "override"
 comment = "License file. Or such. To be confirmed for .pem files"
 SPDX-FileCopyrightText = "None"

coin/module_config.yaml

@@ -6,6 +6,9 @@ accept_configuration:
 
 instructions:
   Build:
+    - type: EnvironmentVariable
+      variableName: VERIFY_SOURCE_SBOM
+      variableValue: "ON"
     - !include "{{qt/qtbase}}/coin_module_build_template_v2.yaml"
 
   Test:

dependencies.yaml

@@ -1,4 +1,4 @@
 dependencies:
   ../qtbase:
-    ref: d89cef439f5c1a58aeff879a12d9a33292764b7f
+    ref: 6db355c6cd1c668ee79bcdccfdc4d5cbc379833f
     required: true

dist/REUSE.toml

@@ -4,5 +4,5 @@ version = 1
 path = ["*"]
 precedence = "override"
 comment = "Licensed as documentation."
-SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd."
+SPDX-FileCopyrightText = "Copyright (C) The Qt Company Ltd."
 SPDX-License-Identifier = "LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only"

licenseRule.json

@@ -1,6 +1,6 @@
 [
     {
-        "comment" : ["file_pattern_ending: strings matched against the end of a file name.",
+        "comment": ["file_pattern_ending: strings matched against the end of a file name.",
                      "location keys: regular expression matched against the beginning of",
                      "the file path (relative to the git submodule root).",
                      "spdx: list of SPDX-License-Expression's allowed in the matching files.",
@@ -9,75 +9,100 @@
                      "unless they are examples",
                      "Files with other endings can also be build system files"
                      ],
-        "file_pattern_ending" : ["CMakeLists.txt", ".cmake", ".pro", ".pri", ".prf",
+        "file_pattern_ending": ["CMakeLists.txt", ".cmake", ".pro", ".pri", ".prf",
-                     "configure", "configure.bat", "cmake.in", "plist.in", "CMakeLists.txt.in"],
+                     "configure", "configure.bat", "cmake.in", "plist.in", "CMakeLists.txt.in",
-        "location" : {
+                     ".cmake.conf",".tag", "ci_config_linux.json",
-            "" : {
+                     ".yaml", ".yml"],
-                "comment" : "Default",
+        "location": {
-                "file type" : "build system",
+            "": {
-                "spdx"      : ["BSD-3-Clause"]
+                "comment": "Default",
+                "file type": "build system",
+                "spdx": ["BSD-3-Clause"]
             },
-            "(.*)(examples/|snippets/)" : {
+            "(.*)(examples/|snippets/)": {
-                "comment" : "Example takes precedent",
+                "comment": "Example takes precedent",
-                "file type" : "examples and snippets",
+                "file type": "examples and snippets",
-                "spdx" : ["LicenseRef-Qt-Commercial OR BSD-3-Clause"]
+                "spdx": ["LicenseRef-Qt-Commercial OR BSD-3-Clause"]
             }
         }
     },
     {
-        "comments" : ["Files with the following endings are Tool licensed,",
+        "comments": ["Files with the following endings are infrastructure licensed"],
+        "file_pattern_ending": [".gitattributes", ".gitignore", ".gitmodules", ".gitreview",
+                                "_clang-format", "licenseRule.json", "REUSE.toml"],
+        "location":{
+            "": {
+                "comment": "Default",
+                "file type": "infrastructure",
+                "spdx": ["LicenseRef-Qt-Commercial OR BSD-3-Clause"]
+            }
+        }
+    },
+    {
+        "comments": ["Files with the following endings are Tool licensed,",
                       "unless they are examples.",
                       "Files with other endings can also be tool files."],
-        "file_pattern_ending" : [".sh", ".py", ".pl", ".bat", ".ps1"],
+        "file_pattern_ending": [".sh", ".py", ".pl", ".bat", ".ps1"],
-        "location" :{
+        "location":{
-            "" : {
+            "": {
-                "comment" : "Default",
+                "comment": "Default",
-                "file type" : "tools and utils",
+                "file type": "tools and utils",
-                "spdx"      : ["LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0"]
+                "spdx": ["LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0"]
             },
-            "(.*)(examples/|snippets/)" : {
+            "(.*)(examples/|snippets/)": {
-                "comment" : "Example takes precedent",
+                "comment": "Example takes precedent",
-                "file type" : "examples and snippets",
+                "file type": "examples and snippets",
-                "spdx" : ["LicenseRef-Qt-Commercial OR BSD-3-Clause"]
+                "spdx": ["LicenseRef-Qt-Commercial OR BSD-3-Clause"]
             }
         }
     },
     {
-        "comment" : "Files with the following endings are Documentation licensed.",
+        "comment": "Files with the following endings are Documentation licensed.",
-        "file_pattern_ending" : [".qdoc", ".qdocinc" , ".qdocconf", ".txt", "README", "qt_attribution.json"],
+        "file_pattern_ending": [".qdoc", ".qdocinc" , ".qdocconf", "README", "qt_attribution.json",
-        "location" :{
+                                 "README.md", ".css"],
-            "" : {
+        "location":{
-                "comment" : "",
+            "": {
-                "file type" : "documentation",
+                "comment": "",
-                "spdx"      : ["LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only"]
+                "file type": "documentation",
+                "spdx": ["LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only"]
             }
         }
     },
     {
-        "comment" : ["All other files",
+        "comment": ["All other files",
                      "The licensing is defined only by the file location in the Qt module repository.",
                      "NO <file_pattern_ending> key for this case!",
                      "This needs to be the last entry of the file."],
-        "location" : {
+        "location": {
-            "" : {
+            "": {
-                "comment" : "Default",
+                "comment": "Default",
-                "file type" : "module and plugin",
+                "file type": "module and plugin",
-                "spdx"      : ["LicenseRef-Qt-Commercial OR GPL-3.0-only"]
+                "spdx": ["LicenseRef-Qt-Commercial OR GPL-3.0-only"]
             },
-            "src/" : {
+            "dist/": {
-                "comment" : "Default",
+                "comment": "Default",
-                "file type" : "module and plugin",
+                "file type": "documentation",
-                "spdx"      : ["LicenseRef-Qt-Commercial OR GPL-3.0-only"]
+                "spdx": ["LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only"]
             },
-            "tests/" : {
+            "src/": {
-                "comment" : "Default",
+                "comment": "Default",
-                "file type" : "test",
+                "file type": "module and plugin",
-                "spdx" : ["LicenseRef-Qt-Commercial OR GPL-3.0-only"]
+                "spdx": ["LicenseRef-Qt-Commercial OR GPL-3.0-only"]
             },
-            "(.*)(examples/|snippets/)" : {
+            "tests/": {
-                "comment" : "Default",
+                "comment": "Default",
-                "file type" : "examples and snippets",
+                "file type": "test",
-                "spdx" : ["LicenseRef-Qt-Commercial OR BSD-3-Clause"]
+                "spdx": ["LicenseRef-Qt-Commercial OR GPL-3.0-only"]
+            },
+            "(.*)(examples/|snippets/)": {
+                "comment": "Default",
+                "file type": "examples and snippets",
+                "spdx": ["LicenseRef-Qt-Commercial OR BSD-3-Clause"]
+            },
+            "tests/auto/qcoapclient/testdata/.*pem": {
+                "comment": "",
+                "file type": "keys",
+                "spdx": ["CC0-1.0"]
             }
         }
     }

src/coap/doc/src/qtcoap-index.qdoc

@@ -67,5 +67,5 @@
     In addition, it is available under the
     \l{GNU General Public License, version 3}.
 
-    \generatelist{groupsbymodule attributions-qtcoap}
+    \annotatedlist attributions-qtcoap
 */

src/coap/qcoapclient.cpp

@@ -1,6 +1,7 @@
 // Copyright (C) 2017 Witekio.
 // Copyright (C) 2018 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
+// Qt-Security score:significant reason:default
 
 #include "qcoapclient_p.h"
 #include "qcoapprotocol_p.h"
@@ -130,10 +131,6 @@ QCoapClientPrivate::~QCoapClientPrivate()
 
     The default for \a securityMode is QtCoap::NoSecurity, which
     disables security.
-
-    This connects using a QCoapQUdpConnection; to use a custom transport,
-    sub-class QCoapConnection and pass an instance to one of the other
-    constructors.
 */
 QCoapClient::QCoapClient(QtCoap::SecurityMode securityMode, QObject *parent) :
     QObject(*new QCoapClientPrivate(new QCoapProtocol, new QCoapQUdpConnection(securityMode)),
@@ -258,7 +255,8 @@ QCoapReply *QCoapClient::put(const QCoapRequest &request, const QByteArray &data
 
     Sends the \a request using the PUT method and returns a new QCoapReply
     object. Uses \a device content as the payload for this request.
-    A null device is treated as empty content.
+    A null device is treated as empty content, in which case the payload of the
+    \a request will be used.
 
     \note The device has to be open and readable before calling this function.
 
@@ -305,7 +303,8 @@ QCoapReply *QCoapClient::post(const QCoapRequest &request, const QByteArray &dat
 
     Sends the \a request using the POST method and returns a new QCoapReply
     object. Uses \a device content as the payload for this request.
-    A null device is treated as empty content.
+    A null device is treated as empty content, in which case the payload of the
+    \a request will be used.
 
     \note The device has to be open and readable before calling this function.
 
@@ -313,10 +312,7 @@ QCoapReply *QCoapClient::post(const QCoapRequest &request, const QByteArray &dat
 */
 QCoapReply *QCoapClient::post(const QCoapRequest &request, QIODevice *device)
 {
-    if (!device)
+    return post(request, device ? device->readAll() : QByteArray());
-        return nullptr;
-
-    return post(request, device->readAll());
 }
 
 /*!
@@ -444,7 +440,7 @@ QCoapReply *QCoapClient::observe(const QCoapRequest &request)
                                                                   d->connection->isSecure());
     copyRequest.enableObserve();
 
-    return get(copyRequest);
+    return d->sendRequest(copyRequest);
 }
 
 /*!

src/coap/qcoapclient.h

@@ -1,6 +1,7 @@
 // Copyright (C) 2017 Witekio.
 // Copyright (C) 2018 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
+// Qt-Security score:significant reason:default
 
 #ifndef QCOAPCLIENT_H
 #define QCOAPCLIENT_H

src/coap/qcoapclient_p.h

@@ -1,6 +1,7 @@
 // Copyright (C) 2017 Witekio.
 // Copyright (C) 2018 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
+// Qt-Security score:significant reason:default
 
 #ifndef QCOAPCLIENT_P_H
 #define QCOAPCLIENT_P_H

src/coap/qcoapconnection.cpp

@@ -1,5 +1,6 @@
 // Copyright (C) 2019 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
+// Qt-Security score:significant reason:default
 
 #include "qcoapconnection_p.h"
 

src/coap/qcoapconnection_p.h

@@ -1,5 +1,6 @@
 // Copyright (C) 2019 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
+// Qt-Security score:significant reason:default
 
 #ifndef QCOAPCONNECTION_P_H
 #define QCOAPCONNECTION_P_H

src/coap/qcoapglobal.h

@@ -1,6 +1,7 @@
 // Copyright (C) 2017 Witekio.
 // Copyright (C) 2018 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
+// Qt-Security score:significant reason:default
 
 #ifndef QCOAPGLOBAL_H
 #define QCOAPGLOBAL_H

src/coap/qcoapinternalmessage.cpp

@@ -1,6 +1,7 @@
 // Copyright (C) 2017 Witekio.
 // Copyright (C) 2018 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
+// Qt-Security score:critical reason:network-protocol
 
 #include "qcoapinternalmessage_p.h"
 #include "qcoaprequest_p.h"

src/coap/qcoapinternalmessage_p.h

@@ -1,6 +1,7 @@
 // Copyright (C) 2017 Witekio.
 // Copyright (C) 2018 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
+// Qt-Security score:significant reason:default
 
 #ifndef QCOAPINTERNALMESSAGE_P_H
 #define QCOAPINTERNALMESSAGE_P_H

src/coap/qcoapinternalreply.cpp

@@ -1,6 +1,7 @@
 // Copyright (C) 2017 Witekio.
 // Copyright (C) 2018 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
+// Qt-Security score:critical reason:network-protocol
 
 #include "qcoapinternalreply_p.h"
 #include <QtCore/qmath.h>

src/coap/qcoapinternalreply_p.h

@@ -1,6 +1,7 @@
 // Copyright (C) 2017 Witekio.
 // Copyright (C) 2018 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
+// Qt-Security score:significant reason:default
 
 #ifndef QCOAPINTERNALREPLY_H
 #define QCOAPINTERNALREPLY_H

src/coap/qcoapinternalrequest.cpp

@@ -1,6 +1,7 @@
 // Copyright (C) 2017 Witekio.
 // Copyright (C) 2018 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
+// Qt-Security score:critical reason:network-protocol
 
 #include "qcoaprequest.h"
 #include "qcoapinternalrequest_p.h"

src/coap/qcoapinternalrequest_p.h

@@ -1,14 +1,15 @@
 // Copyright (C) 2017 Witekio.
 // Copyright (C) 2018 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
+// Qt-Security score:significant reason:default
 
 #ifndef QCOAPINTERNALREQUEST_H
 #define QCOAPINTERNALREQUEST_H
 
 #include <private/qcoapinternalmessage_p.h>
+#include <private/qcoapnamespace_p.h>
 
 #include <QtCoap/qcoapglobal.h>
-#include <QtCoap/qcoapnamespace.h>
 #include <private/qcoapconnection_p.h>
 
 #include <QtCore/qglobal.h>

src/coap/qcoapmessage.cpp

@@ -1,6 +1,7 @@
 // Copyright (C) 2017 Witekio.
 // Copyright (C) 2018 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
+// Qt-Security score:significant reason:default
 
 #include "qcoapmessage_p.h"
 

src/coap/qcoapmessage.h

@@ -1,6 +1,7 @@
 // Copyright (C) 2017 Witekio.
 // Copyright (C) 2018 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
+// Qt-Security score:significant reason:default
 
 #ifndef QCOAPMESSAGE_H
 #define QCOAPMESSAGE_H

src/coap/qcoapmessage_p.h

@@ -1,6 +1,7 @@
 // Copyright (C) 2017 Witekio.
 // Copyright (C) 2018 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
+// Qt-Security score:significant reason:default
 
 #ifndef QCOAPMESSAGE_P_H
 #define QCOAPMESSAGE_P_H

src/coap/qcoapnamespace.cpp

@@ -1,5 +1,6 @@
 // Copyright (C) 2019 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
+// Qt-Security score:significant reason:default
 
 #include "qcoapnamespace_p.h"
 

src/coap/qcoapnamespace.h

@@ -1,20 +1,17 @@
 // Copyright (C) 2017 Witekio.
 // Copyright (C) 2018 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
+// Qt-Security score:significant reason:default
 
 #include <QtCoap/qcoapglobal.h>
 #include <QtCore/qobject.h>
 #include <QtCore/qrandom.h>
-#include <QtCore/qloggingcategory.h>
 
 #ifndef QCOAPNAMESPACE_H
 #define QCOAPNAMESPACE_H
 
 QT_BEGIN_NAMESPACE
 
-Q_DECLARE_LOGGING_CATEGORY(lcCoapExchange)
-Q_DECLARE_LOGGING_CATEGORY(lcCoapConnection)
-
 #define FOR_EACH_COAP_ERROR(X) \
     X(BadRequest, 0x80) X(Unauthorized, 0x81) X(BadOption, 0x82) X(Forbidden, 0x83)  \
     X(NotFound, 0x84) X(MethodNotAllowed, 0x85) X(NotAcceptable, 0x86) \

src/coap/qcoapnamespace_p.h

@@ -1,11 +1,14 @@
 // Copyright (C) 2019 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
+// Qt-Security score:significant reason:default
 
 #ifndef QCOAPNAMESPACE_P_H
 #define QCOAPNAMESPACE_P_H
 
 #include "qcoapnamespace.h"
 #include "private/qglobal_p.h"
+#include <QtCore/qloggingcategory.h>
+
 
 //
 //  W A R N I N G
@@ -20,6 +23,9 @@
 
 QT_BEGIN_NAMESPACE
 
+Q_DECLARE_LOGGING_CATEGORY(lcCoapExchange)
+Q_DECLARE_LOGGING_CATEGORY(lcCoapConnection)
+
 namespace QtCoap
 {
     bool Q_AUTOTEST_EXPORT isError(QtCoap::ResponseCode code);

src/coap/qcoapoption.cpp

@@ -1,6 +1,7 @@
 // Copyright (C) 2017 Witekio.
 // Copyright (C) 2018 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
+// Qt-Security score:significant reason:default
 
 #include "qcoapoption_p.h"
 
@@ -157,7 +158,7 @@ QCoapOption &QCoapOption::operator=(QCoapOption &&other) noexcept
  */
 void QCoapOption::swap(QCoapOption &other) noexcept
 {
-    qSwap(d_ptr, other.d_ptr);
+    qt_ptr_swap(d_ptr, other.d_ptr);
 }
 
 /*!

src/coap/qcoapoption.h

@@ -1,6 +1,7 @@
 // Copyright (C) 2017 Witekio.
 // Copyright (C) 2018 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
+// Qt-Security score:significant reason:default
 
 #ifndef QCOAPOPTION_H
 #define QCOAPOPTION_H

src/coap/qcoapoption_p.h

@@ -1,6 +1,7 @@
 // Copyright (C) 2017 Witekio.
 // Copyright (C) 2018 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
+// Qt-Security score:significant reason:default
 
 #ifndef QCOAPOPTION_P_H
 #define QCOAPOPTION_P_H

src/coap/qcoapprotocol.cpp

@@ -1,6 +1,7 @@
 // Copyright (C) 2017 Witekio.
 // Copyright (C) 2018 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
+// Qt-Security score:critical reason:network-protocol
 
 #include "qcoapprotocol_p.h"
 #include "qcoapinternalrequest_p.h"

src/coap/qcoapprotocol_p.h

@@ -1,6 +1,7 @@
 // Copyright (C) 2017 Witekio.
 // Copyright (C) 2018 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
+// Qt-Security score:significant reason:default
 
 #ifndef QCOAPPROTOCOL_P_H
 #define QCOAPPROTOCOL_P_H

src/coap/qcoapqudpconnection.cpp

@@ -1,8 +1,10 @@
 // Copyright (C) 2017 Witekio.
 // Copyright (C) 2018 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
+// Qt-Security score:significant reason:default
 
 #include "qcoapqudpconnection_p.h"
+#include <private/qcoapnamespace_p.h>
 
 #include <QtCore/qloggingcategory.h>
 #include <QtNetwork/qnetworkdatagram.h>

src/coap/qcoapqudpconnection_p.h

@@ -1,6 +1,7 @@
 // Copyright (C) 2017 Witekio.
 // Copyright (C) 2018 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
+// Qt-Security score:significant reason:default
 
 #ifndef QCOAPQUDPCONNECTION_P_H
 #define QCOAPQUDPCONNECTION_P_H

src/coap/qcoapreply.cpp

@@ -1,6 +1,7 @@
 // Copyright (C) 2017 Witekio.
 // Copyright (C) 2018 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
+// Qt-Security score:significant reason:default
 
 #include "qcoapreply_p.h"
 #include "qcoapinternalreply_p.h"

src/coap/qcoapreply.h

@@ -1,6 +1,7 @@
 // Copyright (C) 2017 Witekio.
 // Copyright (C) 2018 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
+// Qt-Security score:significant reason:default
 
 #ifndef QCOAPREPLY_H
 #define QCOAPREPLY_H

src/coap/qcoapreply_p.h

@@ -1,6 +1,7 @@
 // Copyright (C) 2017 Witekio.
 // Copyright (C) 2018 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
+// Qt-Security score:significant reason:default
 
 #ifndef QCOAPREPLY_P_H
 #define QCOAPREPLY_P_H

src/coap/qcoaprequest.cpp

@@ -1,6 +1,7 @@
 // Copyright (C) 2017 Witekio.
 // Copyright (C) 2018 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
+// Qt-Security score:significant reason:default
 
 #include "qcoaprequest_p.h"
 

src/coap/qcoaprequest.h

@@ -1,6 +1,7 @@
 // Copyright (C) 2017 Witekio.
 // Copyright (C) 2018 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
+// Qt-Security score:significant reason:default
 
 #ifndef QCOAPREQUEST_H
 #define QCOAPREQUEST_H

src/coap/qcoaprequest_p.h

@@ -1,11 +1,12 @@
 // Copyright (C) 2017 Witekio.
 // Copyright (C) 2018 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
+// Qt-Security score:significant reason:default
 
 #ifndef QCOAPREQUEST_P_H
 #define QCOAPREQUEST_P_H
 
-#include <QtCoap/qcoapnamespace.h>
+#include <private/qcoapnamespace_p.h>
 #include <QtCoap/qcoaprequest.h>
 #include <private/qcoapmessage_p.h>
 

src/coap/qcoapresource.cpp

@@ -1,6 +1,7 @@
 // Copyright (C) 2017 Witekio.
 // Copyright (C) 2018 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
+// Qt-Security score:significant reason:default
 
 #include "qcoapresource_p.h"
 

src/coap/qcoapresource.h

@@ -1,6 +1,7 @@
 // Copyright (C) 2017 Witekio.
 // Copyright (C) 2018 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
+// Qt-Security score:significant reason:default
 
 #ifndef QCOAPRESOURCE_H
 #define QCOAPRESOURCE_H

src/coap/qcoapresource_p.h

@@ -1,6 +1,7 @@
 // Copyright (C) 2017 Witekio.
 // Copyright (C) 2018 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
+// Qt-Security score:significant reason:default
 
 #ifndef QCOAPRESOURCE_P_H
 #define QCOAPRESOURCE_P_H

src/coap/qcoapresourcediscoveryreply.cpp

@@ -1,6 +1,7 @@
 // Copyright (C) 2017 Witekio.
 // Copyright (C) 2018 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
+// Qt-Security score:critical reason:data-parser
 
 #include "qcoapresourcediscoveryreply_p.h"
 #include "qcoapinternalreply_p.h"
@@ -108,14 +109,14 @@ QCoapResourceDiscoveryReplyPrivate::resourcesFromCoreLinkList(const QHostAddress
 
     QLatin1String quote = QLatin1String("\"");
     const QList<QByteArray> links = data.split(',');
-    for (QByteArray link : links) {
+    for (const QByteArray &link : links) {
         QCoapResource resource;
         resource.setHost(sender);
 
         const QList<QByteArray> parameterList = link.split(';');
-        for (QByteArray parameter : parameterList) {
+        for (const QByteArray &parameter : parameterList) {
             QString parameterString = QString::fromUtf8(parameter);
-            int length = parameterString.size();
+            const qsizetype length = parameterString.size();
             if (parameter.startsWith('<'))
                 resource.setPath(parameterString.mid(1, length - 2));
             else if (parameter.startsWith("title="))

src/coap/qcoapresourcediscoveryreply.h

@@ -1,6 +1,7 @@
 // Copyright (C) 2017 Witekio.
 // Copyright (C) 2018 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
+// Qt-Security score:significant reason:default
 
 #ifndef QCOAPRESOURCEDISCOVERYREPLY_H
 #define QCOAPRESOURCEDISCOVERYREPLY_H

src/coap/qcoapresourcediscoveryreply_p.h

@@ -1,6 +1,7 @@
 // Copyright (C) 2017 Witekio.
 // Copyright (C) 2018 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
+// Qt-Security score:significant reason:default
 
 #ifndef QCOAPRESOURCEDISCOVERYREPLY_P_H
 #define QCOAPRESOURCEDISCOVERYREPLY_P_H

src/coap/qcoapsecurityconfiguration.cpp

@@ -1,5 +1,6 @@
 // Copyright (C) 2019 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
+// Qt-Security score:significant reason:default
 
 #include "qcoapsecurityconfiguration.h"
 

src/coap/qcoapsecurityconfiguration.h

@@ -1,5 +1,6 @@
 // Copyright (C) 2019 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
+// Qt-Security score:significant reason:default
 
 #ifndef QCOAPSECURITYCONFIGURATION_H
 #define QCOAPSECURITYCONFIGURATION_H

tests/auto/coapnetworksettings.h

@@ -151,7 +151,7 @@ bool waitForHost(const QUrl &url, QtCoap::SecurityMode security = QtCoap::Securi
         if (security != QtCoap::SecurityMode::NoSecurity)
             client.setSecurityConfiguration(createConfiguration(security));
 
-        QSignalSpy spyClientFinished(&client, SIGNAL(finished(QCoapReply *)));
+        QSignalSpy spyClientFinished(&client, SIGNAL(finished(QCoapReply*)));
         client.get(url);
 
         spyClientFinished.wait(1000);

tests/auto/qcoapreply/tst_qcoapreply.cpp

@@ -18,6 +18,7 @@ private Q_SLOTS:
     void updateReply();
     void requestData();
     void abortRequest();
+    void readReplyChunked();
 };
 
 void tst_QCoapReply::updateReply_data()
@@ -117,6 +118,39 @@ void tst_QCoapReply::abortRequest()
     QVERIFY(arguments.at(0).toByteArray() == "token");
 }
 
+void tst_QCoapReply::readReplyChunked()
+{
+    const QByteArray token = "\xAF\x01\xC2";
+    const quint16 id = 645;
+    const QByteArray payload = "this is some payload";
+
+    QScopedPointer<QCoapReply> reply(QCoapReplyPrivate::createCoapReply(QCoapRequest()));
+    QCoapMessage message;
+    message.setToken(token);
+    message.setMessageId(id);
+    message.setPayload(payload);
+
+    QMetaObject::invokeMethod(reply.data(), "_q_setContent",
+                              Q_ARG(QHostAddress, QHostAddress()),
+                              Q_ARG(QCoapMessage, message),
+                              Q_ARG(QtCoap::ResponseCode, QtCoap::ResponseCode::Content));
+    QMetaObject::invokeMethod(reply.data(), "_q_setFinished",
+                              Q_ARG(QtCoap::Error, QtCoap::Error::Ok));
+
+    QCOMPARE_EQ(reply->pos(), 0);
+    const qsizetype startBytes = 7;
+    const QByteArray start = reply->read(startBytes);
+    QCOMPARE_EQ(start, payload.first(startBytes));
+    QCOMPARE_EQ(reply->pos(), startBytes);
+
+    QByteArray last(100, Qt::Uninitialized);
+    const qint64 read = reply->read(last.data(), last.size());
+    QCOMPARE_EQ(read, payload.size() - startBytes);
+    QCOMPARE_EQ(reply->pos(), payload.size());
+    last.resize(read);
+    QCOMPARE_EQ(start + last, payload);
+}
+
 QTEST_MAIN(tst_QCoapReply)
 
 #include "tst_qcoapreply.moc"