Attention is currently required from: matanp, pespin.
Hello Jenkins Builder, pespin,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-bsc/+/35746?usp=email
to look at the new patch set (#3).
The following approvals got outdated and were removed:
Code-Review+1 by pespin
Change subject: ctrl: Split bts_trx_ts_ctrl from bts_trx_ctrl
......................................................................
ctrl: Split bts_trx_ts_ctrl from bts_trx_ctrl
Besides from making the ts ctrl interface follow the convention
of being in its own file, it will be used in the next patch to add
a ctrl interface for lchan.
Change-Id: I9840bddd4eae409bc8373912d54b6bbfc9fc1c1a
---
M include/osmocom/bsc/ctrl.h
M src/osmo-bsc/Makefile.am
M src/osmo-bsc/bts_trx_ctrl.c
A src/osmo-bsc/bts_trx_ts_ctrl.c
4 files changed, 121 insertions(+), 98 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/46/35746/3
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/35746?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I9840bddd4eae409bc8373912d54b6bbfc9fc1c1a
Gerrit-Change-Number: 35746
Gerrit-PatchSet: 3
Gerrit-Owner: matanp <matan1008(a)gmail.com>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-CC: laforge <laforge(a)osmocom.org>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: matanp <matan1008(a)gmail.com>
Gerrit-MessageType: newpatchset
Attention is currently required from: matanp.
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/35746?usp=email )
Change subject: ctrl: Split bts_trx_ts_ctrl from bts_trx_ctrl
......................................................................
Patch Set 2:
(1 comment)
Patchset:
PS2:
the commit log specifies what is done, but doesn't say *why*
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/35746?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I9840bddd4eae409bc8373912d54b6bbfc9fc1c1a
Gerrit-Change-Number: 35746
Gerrit-PatchSet: 2
Gerrit-Owner: matanp <matan1008(a)gmail.com>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-CC: laforge <laforge(a)osmocom.org>
Gerrit-Attention: matanp <matan1008(a)gmail.com>
Gerrit-Comment-Date: Tue, 30 Jan 2024 22:13:32 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Attention is currently required from: laforge.
Hello Jenkins Builder,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/pysim/+/35748?usp=email
to look at the new patch set (#2).
The following approvals got outdated and were removed:
Verified-1 by Jenkins Builder
Change subject: osmo-smdpp: Support multiple different profiles
......................................................................
osmo-smdpp: Support multiple different profiles
Let's simply use the matchingId for filesystem lookup of the UPP file.
This way we can have any number of profiles by simply creating the
respeective files.
Change-Id: I0bc3a14b9fdfcc6322917dd0c69d8295de486950
---
M docs/osmo-smdpp.rst
M osmo-smdpp.py
R smdpp-data/upp/TS48v2_SAIP2.1_NoBERTLV.der
R smdpp-data/upp/TS48v2_SAIP2.3_NoBERTLV.der
M tests/test_esim_saip.py
5 files changed, 43 insertions(+), 5 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/48/35748/2
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/35748?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: I0bc3a14b9fdfcc6322917dd0c69d8295de486950
Gerrit-Change-Number: 35748
Gerrit-PatchSet: 2
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: newpatchset
laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/35748?usp=email )
Change subject: osmo-smdpp: Support multiple different profiles
......................................................................
osmo-smdpp: Support multiple different profiles
Let's simply use the matchingId for filesystem lookup of the UPP file.
This way we can have any number of profiles by simply creating the
respeective files.
Change-Id: I0bc3a14b9fdfcc6322917dd0c69d8295de486950
---
M docs/osmo-smdpp.rst
M osmo-smdpp.py
R smdpp-data/upp/TS48v2_SAIP2.1_NoBERTLV.der
R smdpp-data/upp/TS48v2_SAIP2.3_NoBERTLV.der
4 files changed, 42 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/48/35748/1
diff --git a/docs/osmo-smdpp.rst b/docs/osmo-smdpp.rst
index a84ebee..ad7d902 100644
--- a/docs/osmo-smdpp.rst
+++ b/docs/osmo-smdpp.rst
@@ -21,8 +21,9 @@
* uses test certificates copied from GSMA SGP.26 into `./smdpp-data/certs`, assuming that your osmo-smdppp
would be running at the host name `testsmdpplus1.example.com`
-* always provides the exact same profile to every request. The profile always has the same IMSI and
- ICCID.
+* doesn't understand profile state. Any profile can always be downloaded any number of times, irrespective
+ of the EID or whether it was donwloaded before
+* doesn't perform any personalization, so the IMSI/ICCID etc. are always identical
* **is absolutely insecure**, as it
* does not perform any certificate verification
@@ -83,7 +84,8 @@
The `smdpp-data/certs`` directory contains the DPtls, DPauth and DPpb as well as CI certificates
used; they are copied from GSMA SGP.26 v2.
-The `smdpp-data/upp` directory contains the UPP (Unprotected Profile Package) used.
+The `smdpp-data/upp` directory contains the UPP (Unprotected Profile Package) used. The file names (without
+.der suffix) are looked up by the matchingID parameter from the activation code presented by the LPA.
DNS setup for your LPA
diff --git a/osmo-smdpp.py b/osmo-smdpp.py
index cfcd5f8..8cb0082 100755
--- a/osmo-smdpp.py
+++ b/osmo-smdpp.py
@@ -135,6 +135,7 @@
def __init__(self, server_hostname: str, ci_certs_path: str, use_brainpool: bool = False):
self.server_hostname = server_hostname
+ self.upp_dir = os.path.realpath(os.path.join(DATA_DIR, 'upp'))
self.ci_certs = self.load_certs_from_path(ci_certs_path)
# load DPauth cert + key
self.dp_auth = CertAndPrivkey(oid.id_rspRole_dp_auth_v2)
@@ -344,6 +345,27 @@
if euiccSigned1['serverChallenge'] != ss.serverChallenge:
raise ApiError('8.1', '6.1', 'Verification failed')
+ # If ctxParams1 contains a ctxParamsForCommonAuthentication data object, the SM-DP+ Shall [...]
+ # TODO: We really do a very simplistic job here, this needs to be properly implemented later,
+ # considering all the various cases, profile state, etc.
+ if euiccSigned1['ctxParams1'][0] == 'ctxParamsForCommonAuthentication':
+ cpca = euiccSigned1['ctxParams1'][1]
+ matchingId = cpca.get('matchingId', None)
+ if not matchingId:
+ # TODO: check if any pending profile downloads for the EID
+ raise ApiError('8.2.6', '3.8', 'Refused')
+ if matchingId:
+ # look up profile based on matchingID. We simply check if a given file exists for now..
+ path = os.path.join(self.upp_dir, matchingId) + '.der'
+ # prevent directory traversal attack
+ if os.path.commonprefix((os.path.realpath(path),self.upp_dir)) != self.upp_dir:
+ raise ApiError('8.2.6', '3.8', 'Refused')
+ if not os.path.isfile(path) or not os.access(path, os.R_OK):
+ raise ApiError('8.2.6', '3.8', 'Refused')
+ ss.matchingId = matchingId
+
+ # FIXME: we actually want to perform the profile binding herr, and read the profile metadat from the profile
+
# Put together profileMetadata + _bin
ss.profileMetadata = ProfileMetadata(iccid_bin= h2b(swap_nibbles('89000123456789012358')), spn="OsmocomSPN", profile_name="OsmocomProfile")
profileMetadata_bin = ss.profileMetadata.gen_store_metadata_request()
@@ -425,7 +447,7 @@
# TODO: Check if this order requires a Confirmation Code verification
# Perform actual protection + binding of profile package (or return pre-bound one)
- with open(os.path.join(DATA_DIR, 'upp', 'TS48 V2 eSIM_GTP_SAIP2.1_NoBERTLV.rename2der'), 'rb') as f:
+ with open(os.path.join(self.upp_dir, ss.matchingId)+'.der', 'rb') as f:
upp = UnprotectedProfilePackage.from_der(f.read(), metadata=ss.profileMetadata)
# HACK: Use empty PPP as we're still debuggin the configureISDP step, and we want to avoid
# cluttering the log with stuff happening after the failure
diff --git a/smdpp-data/upp/TS48 V2 eSIM_GTP_SAIP2.1_NoBERTLV.rename2der b/smdpp-data/upp/TS48v2_SAIP2.1_NoBERTLV.der
similarity index 100%
rename from smdpp-data/upp/TS48 V2 eSIM_GTP_SAIP2.1_NoBERTLV.rename2der
rename to smdpp-data/upp/TS48v2_SAIP2.1_NoBERTLV.der
Binary files differ
diff --git a/smdpp-data/upp/TS48 V2 eSIM_GTP_SAIP2.3_NoBERTLV.rename2der b/smdpp-data/upp/TS48v2_SAIP2.3_NoBERTLV.der
similarity index 100%
rename from smdpp-data/upp/TS48 V2 eSIM_GTP_SAIP2.3_NoBERTLV.rename2der
rename to smdpp-data/upp/TS48v2_SAIP2.3_NoBERTLV.der
Binary files differ
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/35748?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: I0bc3a14b9fdfcc6322917dd0c69d8295de486950
Gerrit-Change-Number: 35748
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: newchange
Attention is currently required from: matanp.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/35747?usp=email )
Change subject: ctrl: Add ms power
......................................................................
Patch Set 3:
(2 comments)
Commit Message:
https://gerrit.osmocom.org/c/osmo-bsc/+/35747/comment/69b475df_cf9f8d5f
PS3, Line 7: ctrl: Add ms power
Please add at least a brief description for the command(s) you're adding. Something like: "this new command allows you to control MS power level for a specific logical channel".
I would also point out that the effect of this command may differ depending on whether you have `static` or `dynamic` MS power control. For `static` it would instruct the MS to transmit at the requested power level. However, for `dynamic` it would simply limit the maximum power level and not necessarily affect the actual MS power level.
File src/osmo-bsc/bts_trx_ts_lchan_ctrl.c:
https://gerrit.osmocom.org/c/osmo-bsc/+/35747/comment/1b529b9d_4b01533a
PS3, Line 2: * (C) 2013-2015 by Holger Hans Peter Freyther
: * (C) 2013-2022 by
looks like you're missing to update the copyright header
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/35747?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I6f556b66011be6126d6bac31a14101ba37f81cc4
Gerrit-Change-Number: 35747
Gerrit-PatchSet: 3
Gerrit-Owner: matanp <matan1008(a)gmail.com>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: matanp <matan1008(a)gmail.com>
Gerrit-Comment-Date: Tue, 30 Jan 2024 20:07:40 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment