paulmataruso/open5gs
1
0
Fork 0
mirror of https://github.com/open5gs/open5gs.git synced 2025-11-03 21:43:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Squashed commit of the following:

Browse Source 
commit 5070c19a5469269d036bf243ebdb2740aefc7b8d
Author: Sukchan Lee <acetcom@gmail.com>
Date:   Fri Nov 4 15:46:35 2022 +0900

    updte it

commit e49107f46152ff6dce5658b48cfb2c31df61724a
Author: Sukchan Lee <acetcom@gmail.com>
Date:   Fri Nov 4 11:03:37 2022 +0900

    update it

commit a55b977e044b1d74ccc8a19f1dbf8194c3cd7daa
Author: Sukchan Lee <acetcom@gmail.com>
Date:   Fri Nov 4 10:50:41 2022 +0900

    update it

commit 0ff0930d99bfeb91134271dae0941b4c454d1a3d
Author: Sukchan Lee <acetcom@gmail.com>
Date:   Fri Nov 4 10:09:35 2022 +0900

    update it

commit 8cb5038b66d4a605446c6fc200b77f645f7ad328
Author: Sukchan Lee <acetcom@gmail.com>
Date:   Fri Nov 4 09:39:08 2022 +0900

    update it

commit 0a6829dfb6470f3d9b786363d49387fdc688e33b
Author: Sukchan Lee <acetcom@gmail.com>
Date:   Fri Nov 4 09:06:22 2022 +0900

    update it

commit ea85035300d9a42cc5f8f7ee300d28cd055f0f1c
Author: Sukchan Lee <acetcom@gmail.com>
Date:   Thu Nov 3 21:36:17 2022 +0900

    update it

commit e86ba621de332d3f712569cf0580fc8a5321adbd
Author: Sukchan Lee <acetcom@gmail.com>
Date:   Thu Nov 3 17:39:27 2022 +0900

    update it

commit 2c05df84eabeba7c277c622e5d810768b2895961
Author: Sukchan Lee <acetcom@gmail.com>
Date:   Thu Nov 3 16:20:47 2022 +0900

    update it

commit 43c88aed3f2001fdbc28ce0f11cc21dfcdc5906f
Author: Sukchan Lee <acetcom@gmail.com>
Date:   Wed Nov 2 22:17:37 2022 +0900

    update it

commit b374db4e02e7dd153944f5a6fdc2a50c434dfa09
Author: Sukchan Lee <acetcom@gmail.com>
Date:   Wed Nov 2 22:05:53 2022 +0900

    update it
This commit is contained in:
Sukchan Lee
2022-11-04 17:39:29 +09:00
parent fa35b06963
commit 1cc6736fa8
9 changed files with 138 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
docker/build/Dockerfile
View File

@@ -9,4 +9,7 @@ WORKDIR /open5gs
COPY docker/build/setup.sh /root COPY docker/build/setup.sh /root
COPY ./ /open5gs COPY ./ /open5gs
ADD https://github.com/ufoscout/docker-compose-wait/releases/download/2.9.0/wait /wait
RUN chmod +x /wait
RUN meson build && ninja -C build install RUN meson build && ninja -C build install

10
docker/check.sh
View File

@@ -1,9 +1,9 @@
#!/bin/sh #!/bin/sh
docker-compose run --rm test docker compose run --rm test
TAG=focal docker-compose run --rm test TAG=focal docker compose run --rm test
DIST=fedora docker-compose run --rm test DIST=fedora docker compose run --rm test
DIST=debian docker-compose run --rm test DIST=debian docker compose run --rm test
#DIST=alpine docker-compose run --rm test #DIST=alpine docker compose run --rm test
docker rm $(docker ps -qa --no-trunc --filter "status=exited") docker rm $(docker ps -qa --no-trunc --filter "status=exited")

12
docker/docker-compose.yml
View File

@@ -6,8 +6,10 @@ services:
container_name: open5gs-mongodb container_name: open5gs-mongodb
ports: ports:
- "27017:27017" - "27017:27017"
restart: unless-stopped
volumes: volumes:
- mongodb:/data/db - mongodb:/data/db
- ../docs/assets/webui/mongo-init.js:/docker-entrypoint-initdb.d/mongo-init.js:ro
webui: webui:
build: webui build: webui
@@ -17,10 +19,9 @@ services:
- mongodb - mongodb
ports: ports:
- "3000:3000" - "3000:3000"
depends_on:
- mongodb
environment: environment:
DB_URI: mongodb://mongodb/open5gs - DB_URI=mongodb://mongodb/open5gs
- WAIT_HOSTS=mongodb:27017
base: base:
build: build:
@@ -67,7 +68,8 @@ services:
- mongodb - mongodb
- build - build
environment: environment:
DB_URI: mongodb://mongodb/open5gs - DB_URI=mongodb://mongodb/open5gs
- WAIT_HOSTS=mongodb:27017
cap_add: cap_add:
- NET_ADMIN - NET_ADMIN
devices: devices:
@@ -75,7 +77,7 @@ services:
sysctls: sysctls:
- net.ipv6.conf.all.disable_ipv6=0 - net.ipv6.conf.all.disable_ipv6=0
hostname: open5gs-test hostname: open5gs-test
command: /bin/bash -c "/root/setup.sh; cd /open5gs/build && meson test -v" command: /bin/bash -c "/root/setup.sh; cd /open5gs/build && /wait && meson test -v"
dev: dev:
build: build:

7
docker/webui/Dockerfile
View File

@@ -3,7 +3,7 @@ FROM node:19
MAINTAINER Sukchan Lee <acetcom@gmail.com> MAINTAINER Sukchan Lee <acetcom@gmail.com>
ARG PACKAGE=open5gs ARG PACKAGE=open5gs
ARG VERSION=2.5.4 ARG VERSION=2.5.5
RUN set -e; \ RUN set -e; \
cd /usr/src; \ cd /usr/src; \
@@ -16,6 +16,9 @@ WORKDIR /usr/src/open5gs/webui
RUN npm clean-install && \ RUN npm clean-install && \
npm run build npm run build
CMD npm run start ADD https://github.com/ufoscout/docker-compose-wait/releases/download/2.9.0/wait /wait
RUN chmod +x /wait
CMD /wait && npm run start
EXPOSE 3000 EXPOSE 3000

190
docs/assets/webui/install
View File

@@ -10,7 +10,7 @@
# #
PACKAGE="open5gs" PACKAGE="open5gs"
VERSION="2.5.4" VERSION="2.5.5"
print_status() { print_status() {
echo echo
@@ -93,18 +93,23 @@ preinstall() {
PRE_INSTALL_PKGS="" PRE_INSTALL_PKGS=""
if [ ! -x /usr/bin/lsb_release ]; then # Check that HTTPS transport is available to APT
PRE_INSTALL_PKGS="${PRE_INSTALL_PKGS} lsb-release" # (Check snaked from: https://get.docker.io/ubuntu/)
if [ ! -e /usr/lib/apt/methods/https ]; then
PRE_INSTALL_PKGS="${PRE_INSTALL_PKGS} apt-transport-https"
fi fi
if [ ! -x /usr/bin/node ] && [ ! -x /usr/bin/wget ]; then if [ ! -x /usr/bin/lsb_release ]; then
PRE_INSTALL_PKGS="${PRE_INSTALL_PKGS} nodejs" PRE_INSTALL_PKGS="${PRE_INSTALL_PKGS} lsb-release"
fi fi
if [ ! -x /usr/bin/curl ] && [ ! -x /usr/bin/wget ]; then if [ ! -x /usr/bin/curl ] && [ ! -x /usr/bin/wget ]; then
PRE_INSTALL_PKGS="${PRE_INSTALL_PKGS} curl" PRE_INSTALL_PKGS="${PRE_INSTALL_PKGS} curl"
fi fi
# Used by apt-key to add new keys
if [ ! -x /usr/bin/gpg ]; then if [ ! -x /usr/bin/gpg ]; then
PRE_INSTALL_PKGS="${PRE_INSTALL_PKGS} gnupg" PRE_INSTALL_PKGS="${PRE_INSTALL_PKGS} gnupg"
fi fi
@@ -114,9 +119,17 @@ exec_cmd 'apt-get update'
if [ "X${PRE_INSTALL_PKGS}" != "X" ]; then if [ "X${PRE_INSTALL_PKGS}" != "X" ]; then
print_status "Installing packages required for setup:${PRE_INSTALL_PKGS}..." print_status "Installing packages required for setup:${PRE_INSTALL_PKGS}..."
# This next command needs to be redirected to /dev/null or the script will bork
# in some environments
exec_cmd "apt-get install -y${PRE_INSTALL_PKGS} > /dev/null 2>&1" exec_cmd "apt-get install -y${PRE_INSTALL_PKGS} > /dev/null 2>&1"
fi fi
IS_PRERELEASE=$(lsb_release -d | grep 'Ubuntu .*development' >& /dev/null; echo $?)
if [[ $IS_PRERELEASE -eq 0 ]]; then
print_status "Your distribution, identified as \"$(lsb_release -d -s)\", is a pre-release version of Ubuntu. NodeSource does not maintain official support for Ubuntu versions until they are formally released. You can try using the manual installation instructions available at https://github.com/nodesource/distributions and use the latest supported Ubuntu version name as the distribution identifier, although this is not guaranteed to work."
exit 1
fi
DISTRO=$(lsb_release -c -s) DISTRO=$(lsb_release -c -s)
check_alt() { check_alt() {
@@ -128,54 +141,76 @@ check_alt() {
fi fi
} }
check_alt "SolydXK" "solydxk-9" "Debian" "stretch" check_alt "Astra Linux" "orel" "Debian" "stretch"
check_alt "Kali" "sana" "Debian" "jessie" check_alt "BOSS" "anokha" "Debian" "wheezy"
check_alt "Kali" "kali-rolling" "Debian" "jessie" check_alt "BOSS" "anoop" "Debian" "jessie"
check_alt "Sparky Linux" "Tyche" "Debian" "stretch" check_alt "BOSS" "drishti" "Debian" "stretch"
check_alt "Sparky Linux" "Nibiru" "Debian" "buster" check_alt "BOSS" "unnati" "Debian" "buster"
check_alt "MX Linux 17" "Horizon" "Debian" "stretch" check_alt "BOSS" "urja" "Debian" "bullseye"
check_alt "MX Linux 18" "Continuum" "Debian" "stretch" check_alt "bunsenlabs" "bunsen-hydrogen" "Debian" "jessie"
check_alt "MX Linux 19" "patito feo" "Debian" "buster" check_alt "bunsenlabs" "helium" "Debian" "stretch"
check_alt "Linux Mint" "maya" "Ubuntu" "precise" check_alt "bunsenlabs" "lithium" "Debian" "buster"
check_alt "Linux Mint" "qiana" "Ubuntu" "trusty" check_alt "Devuan" "jessie" "Debian" "jessie"
check_alt "Linux Mint" "rafaela" "Ubuntu" "trusty" check_alt "Devuan" "ascii" "Debian" "stretch"
check_alt "Linux Mint" "rebecca" "Ubuntu" "trusty" check_alt "Devuan" "beowulf" "Debian" "buster"
check_alt "Linux Mint" "rosa" "Ubuntu" "trusty" check_alt "Devuan" "chimaera" "Debian" "bullseye"
check_alt "Linux Mint" "sarah" "Ubuntu" "xenial" check_alt "Devuan" "ceres" "Debian" "sid"
check_alt "Linux Mint" "serena" "Ubuntu" "xenial" check_alt "Deepin" "panda" "Debian" "sid"
check_alt "Linux Mint" "sonya" "Ubuntu" "xenial" check_alt "Deepin" "unstable" "Debian" "sid"
check_alt "Linux Mint" "sylvia" "Ubuntu" "xenial" check_alt "Deepin" "stable" "Debian" "buster"
check_alt "Linux Mint" "tara" "Ubuntu" "bionic" check_alt "Deepin" "apricot" "Debian" "buster"
check_alt "Linux Mint" "tessa" "Ubuntu" "bionic" check_alt "elementaryOS" "luna" "Ubuntu" "precise"
check_alt "Linux Mint" "tina" "Ubuntu" "bionic" check_alt "elementaryOS" "freya" "Ubuntu" "trusty"
check_alt "Linux Mint" "tricia" "Ubuntu" "bionic" check_alt "elementaryOS" "loki" "Ubuntu" "xenial"
check_alt "LMDE" "betsy" "Debian" "jessie" check_alt "elementaryOS" "juno" "Ubuntu" "bionic"
check_alt "LMDE" "cindy" "Debian" "stretch" check_alt "elementaryOS" "hera" "Ubuntu" "bionic"
check_alt "elementaryOS" "luna" "Ubuntu" "precise" check_alt "elementaryOS" "odin" "Ubuntu" "focal"
check_alt "elementaryOS" "freya" "Ubuntu" "trusty" check_alt "elementaryOS" "jolnir" "Ubuntu" "focal"
check_alt "elementaryOS" "loki" "Ubuntu" "xenial" check_alt "Kali" "sana" "Debian" "jessie"
check_alt "elementaryOS" "juno" "Ubuntu" "bionic" check_alt "Kali" "kali-rolling" "Debian" "bullseye"
check_alt "elementaryOS" "hera" "Ubuntu" "bionic" check_alt "Linux Mint" "maya" "Ubuntu" "precise"
check_alt "Trisquel" "toutatis" "Ubuntu" "precise" check_alt "Linux Mint" "qiana" "Ubuntu" "trusty"
check_alt "Trisquel" "belenos" "Ubuntu" "trusty" check_alt "Linux Mint" "rafaela" "Ubuntu" "trusty"
check_alt "Trisquel" "flidas" "Ubuntu" "xenial" check_alt "Linux Mint" "rebecca" "Ubuntu" "trusty"
check_alt "Uruk GNU/Linux" "lugalbanda" "Ubuntu" "xenial" check_alt "Linux Mint" "rosa" "Ubuntu" "trusty"
check_alt "BOSS" "anokha" "Debian" "wheezy" check_alt "Linux Mint" "sarah" "Ubuntu" "xenial"
check_alt "BOSS" "anoop" "Debian" "jessie" check_alt "Linux Mint" "serena" "Ubuntu" "xenial"
check_alt "BOSS" "drishti" "Debian" "stretch" check_alt "Linux Mint" "sonya" "Ubuntu" "xenial"
check_alt "bunsenlabs" "bunsen-hydrogen" "Debian" "jessie" check_alt "Linux Mint" "sylvia" "Ubuntu" "xenial"
check_alt "bunsenlabs" "helium" "Debian" "stretch" check_alt "Linux Mint" "tara" "Ubuntu" "bionic"
check_alt "Tanglu" "chromodoris" "Debian" "jessie" check_alt "Linux Mint" "tessa" "Ubuntu" "bionic"
check_alt "PureOS" "green" "Debian" "sid" check_alt "Linux Mint" "tina" "Ubuntu" "bionic"
check_alt "Devuan" "jessie" "Debian" "jessie" check_alt "Linux Mint" "tricia" "Ubuntu" "bionic"
check_alt "Devuan" "ascii" "Debian" "stretch" check_alt "Linux Mint" "ulyana" "Ubuntu" "focal"
check_alt "Devuan" "beowulf" "Debian" "buster" check_alt "Linux Mint" "ulyssa" "Ubuntu" "focal"
check_alt "Devuan" "ceres" "Debian" "sid" check_alt "Linux Mint" "uma" "Ubuntu" "focal"
check_alt "Deepin" "panda" "Debian" "sid" check_alt "Linux Mint" "una" "Ubuntu" "focal"
check_alt "Deepin" "unstable" "Debian" "sid" check_alt "Linux Mint" "vanessa" "Ubuntu" "jammy"
check_alt "Deepin" "stable" "Debian" "buster" check_alt "Liquid Lemur" "lemur-3" "Debian" "stretch"
check_alt "Pardus" "onyedi" "Debian" "stretch" check_alt "LMDE" "betsy" "Debian" "jessie"
check_alt "Liquid Lemur" "lemur-3" "Debian" "stretch" check_alt "LMDE" "cindy" "Debian" "stretch"
check_alt "LMDE" "debbie" "Debian" "buster"
check_alt "LMDE" "elsie" "Debian" "bullseye"
check_alt "MX Linux 17" "Horizon" "Debian" "stretch"
check_alt "MX Linux 18" "Continuum" "Debian" "stretch"
check_alt "MX Linux 19" "patito feo" "Debian" "buster"
check_alt "MX Linux 21" "wildflower" "Debian" "bullseye"
check_alt "Pardus" "onyedi" "Debian" "stretch"
check_alt "Parrot" "ara" "Debian" "bullseye"
check_alt "PureOS" "green" "Debian" "sid"
check_alt "PureOS" "amber" "Debian" "buster"
check_alt "PureOS" "byzantium" "Debian" "bullseye"
check_alt "SolydXK" "solydxk-9" "Debian" "stretch"
check_alt "Sparky Linux" "Tyche" "Debian" "stretch"
check_alt "Sparky Linux" "Nibiru" "Debian" "buster"
check_alt "Sparky Linux" "Po-Tolo" "Debian" "bullseye"
check_alt "Tanglu" "chromodoris" "Debian" "jessie"
check_alt "Trisquel" "toutatis" "Ubuntu" "precise"
check_alt "Trisquel" "belenos" "Ubuntu" "trusty"
check_alt "Trisquel" "flidas" "Ubuntu" "xenial"
check_alt "Trisquel" "etiona" "Ubuntu" "bionic"
check_alt "Ubilinux" "dolcetto" "Debian" "stretch"
check_alt "Uruk GNU/Linux" "lugalbanda" "Ubuntu" "xenial"
if [ "X${DISTRO}" == "Xdebian" ]; then if [ "X${DISTRO}" == "Xdebian" ]; then
print_status "Unknown Debian-based distribution, checking /etc/debian_version..." print_status "Unknown Debian-based distribution, checking /etc/debian_version..."
@@ -188,31 +223,25 @@ if [ "X${DISTRO}" == "Xdebian" ]; then
fi fi
fi fi
if [ "X${DISTRO}" == "Xbuster" ]; then print_status 'Removing Launchpad PPA Repository for MongoDB...'
if [ -f "/etc/apt/sources.list.d/mongodb-org.list" ]; then for i in /etc/apt/sources.list.d/mongodb-org*; do
print_status 'Removing Launchpad PPA Repository for MongoDB...' exec_cmd "rm -f $i"
exec_cmd "rm -f /etc/apt/sources.list.d/mongodb-org.list" done
fi
print_status 'Adding the MongoDB signing key to your keyring...' print_status 'Adding the MongoDB signing key to your keyring...'
if [ -x /usr/bin/curl ]; then if [ -x /usr/bin/crl ]; then
exec_cmd 'curl -s https://www.mongodb.org/static/pgp/server-4.2.asc | apt-key add -' exec_cmd_nobail "curl -sLf -o /dev/null 'https://www.mongodb.org/static/pgp/server-6.0.asc' | apt-key add -"
else
exec_cmd 'wget -qO- https://www.mongodb.org/static/pgp/server-4.2.asc | apt-key add -'
fi
print_status "Creating apt sources list file for the MongoDB repo..."
exec_cmd "echo 'deb http://repo.mongodb.org/apt/debian buster/mongodb-org/4.2 main' > /etc/apt/sources.list.d/mongodb-org.list"
if [ ! -x /usr/bin/mongod ]; then
MONGODB_INSTALL_PKGS="${MONGODB_INSTALL_PKGS} mongodb-org"
fi
else else
if [ ! -x /usr/bin/mongod ]; then exec_cmd_nobail "wget -qO /dev/null -o /dev/null 'https://www.mongodb.org/static/pgp/server-6.0.asc' | apt-key add -"
MONGODB_INSTALL_PKGS="${MONGODB_INSTALL_PKGS} mongodb" fi
fi
print_status "Creating apt sources list file for the MongoDB repo..."
exec_cmd "echo 'deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu focal/mongodb-org/6.0 multiverse' > /etc/apt/sources.list.d/mongodb-org-6.0.list"
if [ ! -x /usr/bin/mongod ]; then
MONGODB_INSTALL_PKGS="${MONGODB_INSTALL_PKGS} mongodb-org"
fi fi
if [ "X${MONGODB_INSTALL_PKGS}" != "X" ]; then if [ "X${MONGODB_INSTALL_PKGS}" != "X" ]; then
@@ -274,16 +303,7 @@ exec_cmd "rm -rf ./${PACKAGE}-${VERSION}"
postinstall() { postinstall() {
print_status "Default Administrator Account [Username:admin, Password:1423]..." print_status "Default Administrator Account [Username:admin, Password:1423]..."
exec_cmd "mongosh open5gs ./mongo-init.js"
exec_cmd "cat << EOF > ./account.js
db = db.getSiblingDB('open5gs')
cursor = db.accounts.find()
if ( cursor.count() == 0 ) {
db.accounts.insert({ salt: 'f5c15fa72622d62b6b790aa8569b9339729801ab8bda5d13997b5db6bfc1d997', hash: '402223057db5194899d2e082aeb0802f6794622e1cbc47529c419e5a603f2cc592074b4f3323b239ffa594c8b756d5c70a4e1f6ecd3f9f0d2d7328c4cf8b1b766514effff0350a90b89e21eac54cd4497a169c0c7554a0e2cd9b672e5414c323f76b8559bc768cba11cad2ea3ae704fb36abc8abc2619231ff84ded60063c6e1554a9777a4a464ef9cfdfa90ecfdacc9844e0e3b2f91b59d9ff024aec4ea1f51b703a31cda9afb1cc2c719a09cee4f9852ba3cf9f07159b1ccf8133924f74df770b1a391c19e8d67ffdcbbef4084a3277e93f55ac60d80338172b2a7b3f29cfe8a36738681794f7ccbe9bc98f8cdeded02f8a4cd0d4b54e1d6ba3d11792ee0ae8801213691848e9c5338e39485816bb0f734b775ac89f454ef90992003511aa8cceed58a3ac2c3814f14afaaed39cbaf4e2719d7213f81665564eec02f60ede838212555873ef742f6666cc66883dcb8281715d5c762fb236d72b770257e7e8d86c122bb69028a34cf1ed93bb973b440fa89a23604cd3fefe85fbd7f55c9b71acf6ad167228c79513f5cfe899a2e2cc498feb6d2d2f07354a17ba74cecfbda3e87d57b147e17dcc7f4c52b802a8e77f28d255a6712dcdc1519e6ac9ec593270bfcf4c395e2531a271a841b1adefb8516a07136b0de47c7fd534601b16f0f7a98f1dbd31795feb97da59e1d23c08461cf37d6f2877d0f2e437f07e25015960f63', username: 'admin', roles: [ 'admin' ], "__v" : 0})
}
EOF"
exec_cmd "mongo open5gs ./account.js"
exec_cmd "rm -f ./account.js"
} }
## Defer setup until we have the complete script ## Defer setup until we have the complete script

5
docs/assets/webui/mongo-init.js Normal file
View File

@@ -0,0 +1,5 @@
db = db.getSiblingDB('open5gs')
cursor = db.accounts.find()
if ( cursor.count() == 0 ) {
db.accounts.insertOne({ salt: 'f5c15fa72622d62b6b790aa8569b9339729801ab8bda5d13997b5db6bfc1d997', hash: '402223057db5194899d2e082aeb0802f6794622e1cbc47529c419e5a603f2cc592074b4f3323b239ffa594c8b756d5c70a4e1f6ecd3f9f0d2d7328c4cf8b1b766514effff0350a90b89e21eac54cd4497a169c0c7554a0e2cd9b672e5414c323f76b8559bc768cba11cad2ea3ae704fb36abc8abc2619231ff84ded60063c6e1554a9777a4a464ef9cfdfa90ecfdacc9844e0e3b2f91b59d9ff024aec4ea1f51b703a31cda9afb1cc2c719a09cee4f9852ba3cf9f07159b1ccf8133924f74df770b1a391c19e8d67ffdcbbef4084a3277e93f55ac60d80338172b2a7b3f29cfe8a36738681794f7ccbe9bc98f8cdeded02f8a4cd0d4b54e1d6ba3d11792ee0ae8801213691848e9c5338e39485816bb0f734b775ac89f454ef90992003511aa8cceed58a3ac2c3814f14afaaed39cbaf4e2719d7213f81665564eec02f60ede838212555873ef742f6666cc66883dcb8281715d5c762fb236d72b770257e7e8d86c122bb69028a34cf1ed93bb973b440fa89a23604cd3fefe85fbd7f55c9b71acf6ad167228c79513f5cfe899a2e2cc498feb6d2d2f07354a17ba74cecfbda3e87d57b147e17dcc7f4c52b802a8e77f28d255a6712dcdc1519e6ac9ec593270bfcf4c395e2531a271a841b1adefb8516a07136b0de47c7fd534601b16f0f7a98f1dbd31795feb97da59e1d23c08461cf37d6f2877d0f2e437f07e25015960f63', username: 'admin', roles: [ 'admin' ], "__v" : 0})
}

4
webui/package-lock.json generated
View File

@@ -1,12 +1,12 @@
{ {
"name": "open5gs", "name": "open5gs",
"version": "2.5.4", "version": "2.5.5",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "open5gs", "name": "open5gs",
"version": "2.5.4", "version": "2.5.5",
"license": "AGPL-3.0", "license": "AGPL-3.0",
"dependencies": { "dependencies": {
"axios": "^0.27.2", "axios": "^0.27.2",

2
webui/package.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "open5gs", "name": "open5gs",
"version": "2.5.4", "version": "2.5.5",
"description": "Open5gs", "description": "Open5gs",
"main": "index.js", "main": "index.js",
"repository": "https://github.com/open5gs/open5gs/webui", "repository": "https://github.com/open5gs/open5gs/webui",

8
webui/server/routes/auth.js
View File

@@ -29,8 +29,10 @@ router.post('/login',
passport.authenticate('local', { successRedirect: '/' })); passport.authenticate('local', { successRedirect: '/' }));
router.post('/logout', (req, res) => { router.post('/logout', (req, res) => {
req.logout(); req.logout(function(err) {
res.redirect('/'); if (err) { return next(err); }
res.redirect('/');
});
}); });
module.exports = router; module.exports = router;