Skip to content

RDK-59367: Sync up xdialserver changes from RDKE #170

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yuvaramachandran-gurusamy wants to merge 35 commits into
base: 25Q3_sprint
Choose a base branch
from
Open

RDK-59367: Sync up xdialserver changes from RDKE #170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
65a7559
RDKECMF-213 Add CODEOWNERS file
scthunderbolt Dec 17, 2024
f710c87
Merge pull request #125 from rdkcentral/feature/test-workflows
sbarre01 Dec 17, 2024
8efac8e
RDKEMW-254: libsoup3 support
apatel859 Feb 3, 2025
fda6ec5
Merge pull request #128 from rdkcentral/RDKEMW-254-xdial-libsoup24
apatel859 Feb 12, 2025
d16879c
Merge pull request #132 from rdkcentral/main
apatel859 Feb 20, 2025
33ed34b
Merge pull request #2 from rdkcentral/develop
yuvaramachandran-gurusamy Mar 7, 2025
55650a2
RDKTV-35185: Add sync between ssdp_http_server_callback and gdial_ssd…
yuvaramachandran-gurusamy Mar 4, 2025
f6c6d7d
Merge pull request #139 from yuvaramachandran-gurusamy/develop
apatel859 Mar 7, 2025
42da7af
Merge pull request #1 from rdkcentral/develop
hgfell683 Mar 17, 2025
84b8951
RDKEMW-2033: Fix coverity related issue
hgfell683 Mar 17, 2025
36f386d
Merge branch 'feature/RDKEMW-2033' of https://github.com/hgfell683/xd…
hgfell683 Mar 17, 2025
9257820
RDK-55044: [RDKE] Implement DIAL requirement to use on EU product
yuvaramachandran-gurusamy Mar 19, 2025
a503f9e
RDK-56672: Fix parsing issue while restrict addtionalData url per app
yuvaramachandran-gurusamy Mar 21, 2025
974beb6
Merge pull request #144 from yuvaramachandran-gurusamy/topic/RDK-5504…
apatel859 Mar 25, 2025
4a4ea54
Merge pull request #2 from rdkcentral/develop
hgfell683 Mar 26, 2025
a52d864
Merge pull request #141 from hgfell683/feature/RDKEMW-2033
apatel859 Apr 1, 2025
8e05add
RDKEMW-2278: Removal of WPEFrameworkSecurity Agent Utility
tabbas651 Apr 14, 2025
8a97f28
Merge pull request #148 from tabbas651/develop
apatel859 Apr 22, 2025
81f4b89
RDKEMW-4129: Prepare native build environment
yuvaramachandran-gurusamy Jun 5, 2025
024882a
Merge pull request #151 from yuvaramachandran-gurusamy/topic/RDKEMW-4…
apatel859 Jun 5, 2025
6750eba
RDKEMW-4129: Test
yuvaramachandran-gurusamy Jun 5, 2025
82a6e05
Merge pull request #152 from yuvaramachandran-gurusamy/topic/RDKEMW-4…
apatel859 Jun 6, 2025
83a1518
RDKEMW-4129: Prepare native build script
yuvaramachandran-gurusamy Jun 5, 2025
a1da8a4
Merge branch 'topic/RDKEMW-4129' of https://github.com/rdkcentral/xdi…
yuvaramachandran-gurusamy Jun 9, 2025
33b4866
Merge pull request #156 from yuvaramachandran-gurusamy/topic/RDKEMW-4…
apatel859 Jun 9, 2025
c66ef14
remmove duplicates from build_xxx script
apatel859 Jun 9, 2025
8cb0f37
Merge pull request #157 from rdkcentral/topic/RDKEMW-4129-2
apatel859 Jun 9, 2025
7302ede
Update gdial.cpp
ssitar583 Jun 26, 2025
25a6735
Merge pull request #161 from ssitar583/develop
apatel859 Jul 9, 2025
3202ca6
RDKEMW-5927: Crash fix during soup_uri_to_string API call (#163)
yuvaramachandran-gurusamy Aug 5, 2025
206d137
RDKEMW-6891:Coverity errors fix for xdial (#166)
mukesh972 Sep 3, 2025
c48dff7
RDKEMW-9964: Removing onStopped GDial notification (#177)
yuvaramachandran-gurusamy Nov 12, 2025
3da15c8
RDKEMW-11024 - Using copilot identify and fix the static code analysi…
srinibas15 Dec 5, 2025
29f6789
RDKEMW-12059: Fix Coverity identified issues (#183)
dkumar798 Jan 8, 2026
48461dc
RDKEMW-12555 : Fix coveirty workflow scan in xdialserver repo (#187)
agampa263 Jan 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .github/CODEOWNERS
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# These owners will be the default owners for everything in
# the repo. Unless a later match takes precedence,
# @global-owner1 and @global-owner2 will be requested for
# review when someone opens a pull request.
* @rdkcentral/xdialserver-maintainers
25 changes: 25 additions & 0 deletions .github/workflows/native_full_build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: Build Component in Native Environment

on:
push:
branches: [ main, 'sprint/**', 'release/**', topic/*, develop ]
pull_request:
branches: [ main, 'sprint/**', 'release/**', topic/*, develop ]

jobs:
build-entservices-on-pr:
name: Build xdialserver component in github rdkcentral
runs-on: ubuntu-latest
container:
image: ubuntu:22.04

steps:
- name: Checkout code
uses: actions/checkout@v3

- name: native build
run: |
sh -x build_dependencies.sh
sh -x cov_build.sh
env:
GITHUB_TOKEN: ${{ secrets.RDKCM_RDKE }}
Comment on lines +11 to +25

Check warning

Code scanning / CodeQL

Workflow does not contain permissions Medium

Actions job or workflow does not limit the permissions of the GITHUB_TOKEN. Consider setting an explicit permissions block, using the following as a minimal starting point: {contents: read}

Copilot Autofix

AI 16 days ago

In general, the problem is fixed by explicitly setting the least-privilege permissions for the GITHUB_TOKEN, either at the workflow root (applies to all jobs) or per job (applies only to that job). For a simple build job that only checks out code and runs shell scripts, contents: read is usually sufficient.

The best fix here, without changing existing functionality, is to add a minimal permissions block to the build-entservices-on-pr job. This ensures the GITHUB_TOKEN (if used implicitly by any actions in the job) has only read access to repo contents. Since the job uses only actions/checkout@v3 and shell commands, contents: read is enough and will not break existing behavior. Concretely, in .github/workflows/native_full_build.yml, under jobs: build-entservices-on-pr:, add:

    permissions:
      contents: read

indented to align with runs-on and container. No additional imports or definitions are required, and no other files need to be changed.

Suggested changeset 1
.github/workflows/native_full_build.yml

Autofix patch

Autofix patch
Run the following command in your local git repository to apply this patch
cat << 'EOF' | git apply
diff --git a/.github/workflows/native_full_build.yml b/.github/workflows/native_full_build.yml
--- a/.github/workflows/native_full_build.yml
+++ b/.github/workflows/native_full_build.yml
@@ -10,6 +10,8 @@
   build-entservices-on-pr:
     name: Build xdialserver component in github rdkcentral
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
     container:
       image: ubuntu:22.04
 
EOF
@@ -10,6 +10,8 @@
build-entservices-on-pr:
name: Build xdialserver component in github rdkcentral
runs-on: ubuntu-latest
permissions:
contents: read
container:
image: ubuntu:22.04

Copilot is powered by AI and may make mistakes. Always verify output.
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@
DIRS:= server

all:
for dir in $(DIRS); do (cd $$dir && cmake $(PLATFORM_FLAGS) . && make || exit 1) || exit 1; done
for dir in $(DIRS); do (cd $$dir && cmake $(DISABLE_SECURITY_TOKEN) $(PLATFORM_FLAGS) . && make || exit 1) || exit 1; done
clean:
for dir in $(DIRS); do (cd $$dir && make clean || exit 1) || exit 1; done
130 changes: 130 additions & 0 deletions build_dependencies.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,130 @@
#!/bin/bash
set -x
set -e
##############################
GITHUB_WORKSPACE="${PWD}"

cd ${GITHUB_WORKSPACE}

# # #############################
#1. Install Dependencies and packages

apt update
apt install -y git python3 python3-pip cmake ninja-build meson curl libsoup2.4-dev libxml2-dev libglib2.0-dev gobject-introspection libgirepository1.0-dev libgtk-3-dev libcurl4-openssl-dev libcunit1-dev valac pandoc
pip install jsonref

############################
# Build trevor-base64
if [ ! -d "trower-base64" ]; then
git clone https://github.com/xmidt-org/trower-base64.git
fi
cd trower-base64
meson setup --warnlevel 3 --werror build
ninja -C build
ninja -C build install
cd ..
###########################################
# Clone the required repositories

rm -rf iarmbus ThunderTools Thunder entservices-apis entservices-testframework gssdp


git clone https://github.com/rdkcentral/iarmbus.git
export IARMBUS_PATH=$GITHUB_WORKSPACE/iarmbus

git clone --branch R4.4.3 https://github.com/rdkcentral/ThunderTools.git

git clone --branch R4.4.1 https://github.com/rdkcentral/Thunder.git

git clone --branch main https://github.com/rdkcentral/entservices-apis.git

git clone https://$GITHUB_TOKEN@github.com/rdkcentral/entservices-testframework.git
Copy link

Copilot AI Jan 20, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hardcoded GitHub token usage. The script uses $GITHUB_TOKEN for cloning a private repository at line 41, but there's no validation that this environment variable is set. The script should check if GITHUB_TOKEN is defined before attempting to use it, or provide a clear error message if it's missing.

Suggested change
git clone https://$GITHUB_TOKEN@github.com/rdkcentral/entservices-testframework.git
if [ -z "${GITHUB_TOKEN:-}" ]; then
echo "Error: GITHUB_TOKEN environment variable is not set. Cannot clone entservices-testframework." >&2
exit 1
fi
git clone https://${GITHUB_TOKEN}@github.com/rdkcentral/entservices-testframework.git

Copilot uses AI. Check for mistakes.

git clone --branch gssdp-1.2.3 https://gitlab.gnome.org/GNOME/gssdp.git

############################
# Build gssdp-1.2
echo "======================================================================================"
echo "buliding gssdp-1.2"
cd gssdp

rm -rf build
meson setup build

ninja -C build
ninja -C build install
cd -

############################
# Build Thunder-Tools
echo "======================================================================================"
echo "buliding thunderTools"
cd ThunderTools
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/00010-R4.4-Add-support-for-project-dir.patch
cd -


cmake -G Ninja -S ThunderTools -B build/ThunderTools \
-DEXCEPTIONS_ENABLE=ON \
-DCMAKE_INSTALL_PREFIX="/usr" \
-DCMAKE_MODULE_PATH="$GITHUB_WORKSPACE/install/tools/cmake" \
-DGENERIC_CMAKE_MODULE_PATH="$GITHUB_WORKSPACE/install/tools/cmake" \

cmake --build build/ThunderTools --target install


############################
# Build Thunder
echo "======================================================================================"
echo "buliding thunder"

cd Thunder
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/Use_Legact_Alt_Based_On_ThunderTools_R4.4.3.patch
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/error_code_R4_4.patch
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/1004-Add-support-for-project-dir.patch
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/RDKEMW-733-Add-ENTOS-IDS.patch
cd -

cmake -G Ninja -S Thunder -B build/Thunder \
-DMESSAGING=ON \
-DCMAKE_INSTALL_PREFIX="/usr" \
-DCMAKE_MODULE_PATH="$GITHUB_WORKSPACE/install/tools/cmake" \
-DGENERIC_CMAKE_MODULE_PATH="$GITHUB_WORKSPACE/install/tools/cmake" \
-DBUILD_TYPE=Debug \
-DBINDING=127.0.0.1 \
-DPORT=55555 \
-DEXCEPTIONS_ENABLE=ON \

cmake --build build/Thunder --target install

############################
# Build entservices-apis
echo "======================================================================================"
echo "buliding entservices-apis"
cd entservices-apis
rm -rf jsonrpc/DTV.json
cd ..

cmake -G Ninja -S entservices-apis -B build/entservices-apis \
-DEXCEPTIONS_ENABLE=ON \
-DCMAKE_INSTALL_PREFIX="/usr" \
-DCMAKE_MODULE_PATH="$GITHUB_WORKSPACE/install/tools/cmake" \

cmake --build build/entservices-apis --target install

############################

############################
# Build and deploy stubs for IARMBus and WPEFramework securityagent
mkdir -p /usr/include/WPEFramework/securityagent
cp $GITHUB_WORKSPACE/stubs/securityagent/* /usr/include/WPEFramework/securityagent/ -v

echo "======================================================================================"
echo "Building IARMBus and WPEFramework securityagent stubs"
cd $GITHUB_WORKSPACE
cd ./stubs
g++ -fPIC -shared -o libIARMBus.so iarm_stubs.cpp -I$GITHUB_WORKSPACE/stubs -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I$IARMBUS_PATH/core -I$IARMBUS_PATH/core/include -fpermissive
g++ -fPIC -shared -o libWPEFrameworkSecurityUtil.so securityagent/SecurityTokenUtil.cpp -I$GITHUB_WORKSPACE/stubs -fpermissive

cp libIARMBus.so /usr/local/lib/
cp libWPEFrameworkSecurityUtil.so /usr/local/lib/
16 changes: 16 additions & 0 deletions cov_build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
#!/bin/bash
set -x
set -e
##############################
GITHUB_WORKSPACE="${PWD}"
ls -la ${GITHUB_WORKSPACE}
############################
# Build xdialserver
echo "buliding xdialserver"

cd ${GITHUB_WORKSPACE}

make

echo "======================================================================================"
exit 0
10 changes: 8 additions & 2 deletions server/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,20 @@ find_package (PkgConfig REQUIRED)
pkg_search_module (GLIB REQUIRED glib-2.0)
pkg_search_module (GIO REQUIRED gio-2.0)
pkg_search_module (GSSDP12 gssdp-1.2)
pkg_search_module (LIBSOUP3 libsoup-3.0)
if (GSSDP12_FOUND)
pkg_search_module (GSSDP REQUIRED gssdp-1.2)
add_definitions(-DHAVE_GSSDP_VERSION_1_2_OR_NEWER)
message("Using gssdp-1.2")
else()
pkg_search_module (GSSDP REQUIRED gssdp-1.0)
endif()
pkg_search_module (SOUP REQUIRED libsoup-2.4)
if (LIBSOUP3_FOUND)
pkg_search_module (SOUP REQUIRED libsoup-3.0)
message("Using libsoup-3.0")
else()
pkg_search_module (SOUP REQUIRED libsoup-2.4)
endif()
pkg_search_module (XML2 REQUIRED libxml-2.0)

set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -g")
Expand Down Expand Up @@ -101,4 +107,4 @@ target_link_libraries (gdial-server

add_executable (gdial-server-ut gdialserver_ut.cpp)

target_link_libraries (gdial-server-ut gdial-plat gdial-server)
target_link_libraries (gdial-server-ut gdial-plat gdial-server)
Loading
Loading