- gerrit-log - lists.osmocom.org

[M] Change in osmo-pcap[master]: pcap-server: Introduce VTY cmd '[no] completed-path'
by pespin 20 Dec '24

20 Dec '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39201?usp=email ) Change subject: pcap-server: Introduce VTY cmd '[no] completed-path' ...................................................................... pcap-server: Introduce VTY cmd '[no] completed-path' This VTY allows enabling feature to instruct osmo-pcap-server to move the closed files (due to ration) into a separate directory. This is useful for users who want to monitor and act on closed pcap files to eg. generate statistics, etc. Important: completed-path must be in the same filesystem mountpoint as base-path, since osmo-pcap-server is actually not copying the files, but atomically renaming the paths through rename() syscall. Related: SYS#7248 Change-Id: I5166d1c5d9eb45358c87c2e1c5fbf7969d1d5294 --- M doc/manuals/chapters/server.adoc M include/osmo-pcap/osmo_pcap_server.h M src/osmo_server_network.c M src/osmo_server_vty.c 4 files changed, 131 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/01/39201/1 diff --git a/doc/manuals/chapters/server.adoc b/doc/manuals/chapters/server.adoc index c6404ab..4346aae 100644 --- a/doc/manuals/chapters/server.adoc +++ b/doc/manuals/chapters/server.adoc @@ -125,3 +125,21 @@ Saving procedure), osmo-pcap-server may end up recreating (and truncating) a previous pcap file if it is generated with the same localtime timestamp, for instance because connection from osmo-pcap-client was re-established. + +=== Completed pcap directory + +`osmo-pcap-server` creates and writes data to opened pcap files in the +`base-path` directory configured through VTY. Furthermore, if user supplies a +`completed-path` directory through the VTY, `osmo-pcap-server` will move the +file from `base-path` to `completed-path` directory once it closes the current +file due to rotation or because `osmo-pcap-client` became disconnected. The file +name is kept when moving from one directory to the other. + +This feature is useful for users who wants to have an external tool monitoring a +directory for new closed pcap files and then acting on them, eg. to gather +statistics of packets. + +NOTE:: `osmo-pcap-server` uses a rename() call to move the file atomically. +However, this has the drawback that both `base-path` and `completed-path` must +be placed in the same filesystem mounting point. Using directories in different +filesystem mount points will fail. diff --git a/include/osmo-pcap/osmo_pcap_server.h b/include/osmo-pcap/osmo_pcap_server.h index 50bb121..614ceca 100644 --- a/include/osmo-pcap/osmo_pcap_server.h +++ b/include/osmo-pcap/osmo_pcap_server.h @@ -140,6 +140,7 @@ bool dh_params_allocated; char *base_path; + char *completed_path; mode_t permission_mask; off_t max_size; bool max_size_enabled; diff --git a/src/osmo_server_network.c b/src/osmo_server_network.c index 8747091..9750170 100644 --- a/src/osmo_server_network.c +++ b/src/osmo_server_network.c @@ -39,6 +39,9 @@ #include <errno.h> #include <string.h> #include <unistd.h> +#include <limits.h> +#include <stdlib.h> +#include <libgen.h> static void pcap_zmq_send(void *publ, const void *data, size_t len, int flags) { @@ -112,6 +115,84 @@ 0); } +/* Move pcap file from base_path to completed_path, and updates + * conn->curr_filename to point to new location. */ +void move_completed_trace_if_needed(struct osmo_pcap_conn *conn) +{ + struct osmo_pcap_server *server = conn->server; + char *curr_filename_cpy_bname = NULL; + char *curr_filename_cpy_dname = NULL; + char *bname = NULL; + char *curr_dirname = NULL; + char *new_dirname = NULL; + char *new_filename = NULL; + size_t new_filename_len; + int rc; + + if (!conn->curr_filename) + return; + + if (!server->completed_path) + return; + + /* Assumption: curr_filename is anonicalized absolute pathname. */ + + /* basename and dirname may modify input param, and return a string + * which shall not be freed, potentially pointing to the input param. */ + curr_filename_cpy_dname = talloc_strdup(conn, conn->curr_filename); + curr_filename_cpy_bname = talloc_strdup(conn, conn->curr_filename); + if (!curr_filename_cpy_dname || !curr_filename_cpy_bname) + goto ret_free1; + + curr_dirname = dirname(curr_filename_cpy_dname); + bname = basename(curr_filename_cpy_bname); + if (!curr_dirname || !bname) { + LOGP(DSERVER, LOGL_ERROR, "Failed to resolve dirname and basename for '%s'\n", + conn->curr_filename); + goto ret_free1; + } + + new_dirname = realpath(server->completed_path, NULL); + if (!new_dirname) { + LOGP(DSERVER, LOGL_ERROR, "Failed to resolve path '%s': %s\n", + server->completed_path, strerror(errno)); + goto ret_free1; + } + + new_filename_len = strlen(new_dirname) + 1 /* '/' */ + strlen(bname) + 1 /* '\0' */; + new_filename = talloc_size(conn, new_filename_len); + if (!new_filename) + goto ret_free1; + rc = snprintf(new_filename, new_filename_len, "%s/%s", new_dirname, bname); + if (rc != new_filename_len - 1) + goto ret_free2; + + LOGP(DSERVER, LOGL_INFO, "Moving completed pcap file '%s' -> '%s'\n", conn->curr_filename, new_filename); + rc = rename(conn->curr_filename, new_filename); + if (rc == -1) { + int err = errno; + LOGP(DSERVER, LOGL_ERROR, "Failed moving completed pcap file '%s' -> '%s': %s\n", + conn->curr_filename, new_filename, strerror(err)); + if (err == EXDEV) + LOGP(DSERVER, LOGL_ERROR, "Fix your config! %s and %s shall not be in different filesystems!\n", + curr_dirname, new_dirname); + goto ret_free2; + } + + /* Now replace conn->curr_filename with new path: */ + talloc_free(conn->curr_filename); + conn->curr_filename = new_filename; + /* new_filename has been assigned, so we don't want to free it, hence move to ret_free1: */ + goto ret_free1; + +ret_free2: + talloc_free(new_filename); +ret_free1: + free(new_dirname); + talloc_free(curr_filename_cpy_bname); + talloc_free(curr_filename_cpy_dname); +} + void osmo_pcap_server_close_trace(struct osmo_pcap_conn *conn) { if (conn->local_fd >= 0) { @@ -119,6 +200,8 @@ conn->local_fd = -1; } + move_completed_trace_if_needed(conn); + if (conn->curr_filename) { client_event(conn, "closingtracefile", conn->curr_filename); rate_ctr_inc2(conn->ctrg, PEER_CTR_PROTATE); diff --git a/src/osmo_server_vty.c b/src/osmo_server_vty.c index ee3f995..1e8e05c 100644 --- a/src/osmo_server_vty.c +++ b/src/osmo_server_vty.c @@ -97,6 +97,8 @@ vty_out(vty, "server%s", VTY_NEWLINE); vty_out(vty, " base-path %s%s", pcap_server->base_path, VTY_NEWLINE); + if (pcap_server->completed_path) + vty_out(vty, " completed-path %s%s", pcap_server->completed_path, VTY_NEWLINE); vty_out(vty, " file-permission-mask 0%o%s", pcap_server->permission_mask, VTY_NEWLINE); if (pcap_server->addr) vty_out(vty, " server ip %s%s", pcap_server->addr, VTY_NEWLINE); @@ -159,6 +161,31 @@ return CMD_SUCCESS; } +DEFUN(cfg_server_no_completed_path, + cfg_server_no_completed_path_cmd, + "no completed-path", + NO_STR "Base path for completed (already closed, rotated) log files. Completed files won't be moved.\n") +{ + TALLOC_FREE(pcap_server->completed_path); + return CMD_SUCCESS; +} + +DEFUN(cfg_server_completed_path, + cfg_server_completed_path_cmd, + "completed-path PATH", + "Base path for completed (already closed, rotated) log files\n" "Path\n") +{ + /* Validate we can resolve path: */ + char *tmp = realpath(argv[0], NULL); + if (!tmp) { + vty_out(vty, "%% Failed to resolve path '%s': %s%s", argv[0], strerror(errno), VTY_NEWLINE); + return CMD_WARNING; + } + free(tmp); + osmo_talloc_replace_string(pcap_server, &pcap_server->completed_path, argv[0]); + return CMD_SUCCESS; +} + DEFUN(cfg_server_file_permission_mask, cfg_server_file_permission_mask_cmd, "file-permission-mask MODE", @@ -671,6 +698,8 @@ install_node(&server_node, config_write_server); install_element(SERVER_NODE, &cfg_server_base_cmd); + install_element(SERVER_NODE, &cfg_server_no_completed_path_cmd); + install_element(SERVER_NODE, &cfg_server_completed_path_cmd); install_element(SERVER_NODE, &cfg_server_file_permission_mask_cmd); install_element(SERVER_NODE, &cfg_server_ip_cmd); install_element(SERVER_NODE, &cfg_server_port_cmd); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/39201?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I5166d1c5d9eb45358c87c2e1c5fbf7969d1d5294 Gerrit-Change-Number: 39201 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in pysim[master]: javacard, cosmetic: fix sourcecode fromatting and improve docstring
by dexter 20 Dec '24

20 Dec '24

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/39194?usp=email ) Change subject: javacard, cosmetic: fix sourcecode fromatting and improve docstring ...................................................................... javacard, cosmetic: fix sourcecode fromatting and improve docstring The line with TAGS is longer than 120 columns and there is some comment that should be moved to the python docstring. Related: OS#6679 Change-Id: I1d02098320cfbe17a0eb1bfdcf3bc85034cc8e20 --- M pySim/javacard.py 1 file changed, 7 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/94/39194/1 diff --git a/pySim/javacard.py b/pySim/javacard.py index 46f6ec0..07b0f39 100644 --- a/pySim/javacard.py +++ b/pySim/javacard.py @@ -6,14 +6,16 @@ import io def ijc_to_cap(in_file: io.IOBase, out_zip: zipfile.ZipFile, p : str = "foo"): - """Convert an ICJ (Interoperable Java Card) file [back] to a CAP file.""" - TAGS = ["Header", "Directory", "Applet", "Import", "ConstantPool", "Class", "Method", "StaticField", "RefLocation", "Export", "Descriptor", "Debug"] + """Convert an ICJ (Interoperable Java Card) file [back] to a CAP file. + example usage: + with io.open(sys.argv[1],"rb") as f, zipfile.ZipFile(sys.argv[2], "wb") as z: + ijc_to_cap(f, z) + """ + TAGS = ["Header", "Directory", "Applet", "Import", "ConstantPool", "Class", "Method", "StaticField", "RefLocation", + "Export", "Descriptor", "Debug"] b = in_file.read() while len(b): tag, size = struct.unpack('!BH', b[0:3]) out_zip.writestr(p+"/javacard/"+TAGS[tag-1]+".cap", b[0:3+size]) b = b[3+size:] -# example usage: -# with io.open(sys.argv[1],"rb") as f, zipfile.ZipFile(sys.argv[2], "wb") as z: -# ijc_to_cap(f, z) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/39194?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I1d02098320cfbe17a0eb1bfdcf3bc85034cc8e20 Gerrit-Change-Number: 39194 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de>

1 0

[XS] Change in pysim[master]: global_platform: remove unused code
by dexter 20 Dec '24

20 Dec '24

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/39195?usp=email ) Change subject: global_platform: remove unused code ...................................................................... global_platform: remove unused code This commented out part is not needed anymore. Related: OS#6679 Change-Id: If1de0218f841159789ac86f6a13740c1cbd0a57a --- M pySim/global_platform/__init__.py 1 file changed, 0 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/95/39195/1 diff --git a/pySim/global_platform/__init__.py b/pySim/global_platform/__init__.py index fddab4e..28cc01e 100644 --- a/pySim/global_platform/__init__.py +++ b/pySim/global_platform/__init__.py @@ -897,13 +897,6 @@ super().__init__(aid=aid, name='ADF.ISD', desc='Issuer Security Domain') self.adf.scp_key_identity = 'ICCID' -#class CardProfileGlobalPlatform(CardProfile): -# ORDER = 23 -# -# def __init__(self, name='GlobalPlatform'): -# super().__init__(name, desc='GlobalPlatfomr 2.1.1', cla=['00','80','84'], sw=sw_table) - - class GpCardKeyset: """A single set of GlobalPlatform card keys and the associated KVN.""" def __init__(self, kvn: int, enc: bytes, mac: bytes, dek: bytes): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/39195?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: If1de0218f841159789ac86f6a13740c1cbd0a57a Gerrit-Change-Number: 39195 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de>

1 0

[XS] Change in pysim[master]: global_platform: fix command "delete"
by dexter 20 Dec '24

20 Dec '24

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/39196?usp=email ) Change subject: global_platform: fix command "delete" ...................................................................... global_platform: fix command "delete" The delete command formats a TPDU, not APDU, which leads to warning messages Related: OS#6679 Change-Id: Id04c89acbd4f449cb974d3cb05024f11dba4684e --- M pySim/global_platform/__init__.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/96/39196/1 diff --git a/pySim/global_platform/__init__.py b/pySim/global_platform/__init__.py index 28cc01e..043a86a 100644 --- a/pySim/global_platform/__init__.py +++ b/pySim/global_platform/__init__.py @@ -791,7 +791,7 @@ self.delete(0x00, p2, cmd) def delete(self, p1:int, p2:int, data:Hexstr) -> ResTuple: - cmd_hex = "80E4%02x%02x%02x%s" % (p1, p2, len(data)//2, data) + cmd_hex = "80E4%02x%02x%02x%s00" % (p1, p2, len(data)//2, data) return self._cmd.lchan.scc.send_apdu_checksw(cmd_hex) est_scp02_parser = argparse.ArgumentParser() -- To view, visit https://gerrit.osmocom.org/c/pysim/+/39196?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Id04c89acbd4f449cb974d3cb05024f11dba4684e Gerrit-Change-Number: 39196 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de>

1 0

[XS] Change in pysim[master]: global_platform: add spec reference to help of --install-parameters
by dexter 20 Dec '24

20 Dec '24

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/39197?usp=email ) Change subject: global_platform: add spec reference to help of --install-parameters ...................................................................... global_platform: add spec reference to help of --install-parameters Related: OS#6679 Change-Id: I7e8174d469e09ad130d2866663a65bdeb4afc35a --- M pySim/global_platform/__init__.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/97/39197/1 diff --git a/pySim/global_platform/__init__.py b/pySim/global_platform/__init__.py index 043a86a..c0607ae 100644 --- a/pySim/global_platform/__init__.py +++ b/pySim/global_platform/__init__.py @@ -724,7 +724,7 @@ inst_inst_parser.add_argument('--application-aid', type=is_hexstr, required=True, help='Application AID') inst_inst_parser.add_argument('--install-parameters', type=is_hexstr, default='', - help='Install Parameters') + help='Install Parameters (GPC_SPE_034, section 11.5.2.3.7, table 11-49)') inst_inst_parser.add_argument('--privilege', action='append', dest='privileges', default=[], choices=list(Privileges._construct.flags.keys()), help='Privilege granted to newly installed Application') -- To view, visit https://gerrit.osmocom.org/c/pysim/+/39197?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I7e8174d469e09ad130d2866663a65bdeb4afc35a Gerrit-Change-Number: 39197 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de>

1 0

[M] Change in pysim[master]: javacard: add parser for JAVA-card CAP file format
by dexter 20 Dec '24

20 Dec '24

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/39198?usp=email ) Change subject: javacard: add parser for JAVA-card CAP file format ...................................................................... javacard: add parser for JAVA-card CAP file format To install JAVA-card applets we need to be able to extract the executeable loadfile and the AIDs of the applet and the loadfile. This patch adds the parser and related unittests. Related: OS#6679 Change-Id: I581483ccb9d8a254fcecc995fec3c811c5cf38eb --- M pySim/javacard.py A tests/unittests/test_javacard.cap A tests/unittests/test_javacard.py 3 files changed, 173 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/98/39198/1 diff --git a/pySim/javacard.py b/pySim/javacard.py index 07b0f39..c304999 100644 --- a/pySim/javacard.py +++ b/pySim/javacard.py @@ -1,9 +1,30 @@ # JavaCard related utilities - +# +# (C) 2024 by Sysmocom s.f.m.c. GmbH +# All Rights Reserved +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# import zipfile import struct import sys import io +from osmocom.utils import b2h +from construct import Struct, Array, this, Int32ub, Int16ub, Int8ub +from osmocom.construct import * +from osmocom.tlv import * +from construct import Optional as COptional def ijc_to_cap(in_file: io.IOBase, out_zip: zipfile.ZipFile, p : str = "foo"): """Convert an ICJ (Interoperable Java Card) file [back] to a CAP file. @@ -19,3 +40,136 @@ out_zip.writestr(p+"/javacard/"+TAGS[tag-1]+".cap", b[0:3+size]) b = b[3+size:] +class CapFile(): + + #TODO: At the moment we only support the compact .cap format, add support for the extended .cap format. + + __component_header = None + __component_directory = None + __component_applet = None #optional + __component_import = None + __component_constantPool = None + __component_class = None + __component_method = None + __component_staticField = None + __component_referenceLocation = None + __component_export = None #optional + __component_descriptor = None + __component_debug = None #optional, since CAP format 2.2 + + # Java Card Platform Virtual Machine Specification, v3.2, section 6.4 + __header_component_compact = Struct('tag'/Int8ub, + 'size'/Int16ub, + 'magic'/Int32ub, + 'minor_version'/Int8ub, + 'major_version'/Int8ub, + 'flags'/Int8ub, + 'package'/Struct('minor_version'/Int8ub, + 'major_version'/Int8ub, + 'AID'/LV), + 'package_name'/COptional(LV)) #since CAP format 2.2 + + # Java Card Platform Virtual Machine Specification, v3.2, section 6.6 + __applet_component_compact = Struct('tag'/Int8ub, + 'size'/Int16ub, + 'count'/Int8ub, + 'applets'/Array(this.count, Struct('AID'/LV, + 'install_method_offset'/Int16ub)), + ) + + def __init__(self, filename:str): + # Extract the nested .cap components from the .cap file + # See also: Java Card Platform Virtual Machine Specification, v3.2, section 6.2.1 + cap = zipfile.ZipFile(filename) + cap_namelist = cap.namelist() + for i, filename in enumerate(cap_namelist): + if filename.lower().endswith('header.cap'): + self.__component_header = cap.read(filename) + elif filename.lower().endswith('directory.cap'): + self.__component_directory = cap.read(filename) + elif filename.lower().endswith('applet.cap'): + self.__component_applet = cap.read(filename) + elif filename.lower().endswith('import.cap'): + self.__component_import = cap.read(filename) + elif filename.lower().endswith('constantpool.cap'): + self.__component_constantPool = cap.read(filename) + elif filename.lower().endswith('class.cap'): + self.__component_class = cap.read(filename) + elif filename.lower().endswith('method.cap'): + self.__component_method = cap.read(filename) + elif filename.lower().endswith('staticfield.cap'): + self.__component_staticField = cap.read(filename) + elif filename.lower().endswith('reflocation.cap'): + self.__component_referenceLocation = cap.read(filename) + elif filename.lower().endswith('export.cap'): + self.__component_export = cap.read(filename) + elif filename.lower().endswith('descriptor.cap'): + self.__component_descriptor = cap.read(filename) + elif filename.lower().endswith('debug.cap'): + self.__component_debug = cap.read(filename) + + # Make sure that all mandatory components are present + # See also: Java Card Platform Virtual Machine Specification, v3.2, section 6.2 + if self.__component_header is None: + raise ValueError("invalid cap file, COMPONENT_Header missing!") + if self.__component_directory is None: + raise ValueError("invalid cap file, COMPONENT_Directory missing!") + if self.__component_import is None: + raise ValueError("invalid cap file, COMPONENT_Import missing!") + if self.__component_constantPool is None: + raise ValueError("invalid cap file, COMPONENT_ConstantPool missing!") + if self.__component_class is None: + raise ValueError("invalid cap file, COMPONENT_Class missing!") + if self.__component_method is None: + raise ValueError("invalid cap file, COMPONENT_Method missing!") + if self.__component_staticField is None: + raise ValueError("invalid cap file, COMPONENT_StaticField missing!") + if self.__component_referenceLocation is None: + raise ValueError("invalid cap file, COMPONENT_ReferenceLocation missing!") + if self.__component_descriptor is None: + raise ValueError("invalid cap file, COMPONENT_Descriptor missing!") + + def get_loadfile(self): + """Get the executeable loadfile as hexstring""" + # Concatenate all cap file components in the specified order + # see also: Java Card Platform Virtual Machine Specification, v3.2, section 6.3 + loadfile = self.__component_header + loadfile += self.__component_directory + loadfile += self.__component_import + if self.__component_applet: + loadfile += self.__component_applet + loadfile += self.__component_class + loadfile += self.__component_method + loadfile += self.__component_staticField + if self.__component_export: + loadfile += self.__component_export + loadfile += self.__component_constantPool + loadfile += self.__component_referenceLocation + if self.__component_descriptor: + loadfile += self.__component_descriptor + return b2h(loadfile) + + def get_loadfile_aid(self): + """Get the loadfile AID as hexstring""" + header = self.__header_component_compact.parse(self.__component_header) + magic = header['magic'] or 0 + if magic != 0xDECAFFED: + raise ValueError("invalid cap file, COMPONENT_Header lacks magic number (0x%08X!=0xDECAFFED)!" % magic) + #TODO: check cap version and make sure we are compatible with it + return header['package']['AID'] + + def get_applet_aid(self, index:int = 0): + """Get the applet AID as hexstring""" + #To get the module AID, we must look into COMPONENT_Applet. Unfortunately, even though this component should + #be present in any .cap file, it is defined as an optional component. + if self.__component_applet is None: + raise ValueError("can't get the AID, this cap file lacks the optional COMPONENT_Applet component!") + + applet = self.__applet_component_compact.parse(self.__component_applet) + + if index > applet['count']: + raise ValueError("can't get the AID for applet with index=%u, this .cap file only has %u applets!" % + (index, applet['count'])) + + return applet['applets'][index]['AID'] + diff --git a/tests/unittests/test_javacard.cap b/tests/unittests/test_javacard.cap new file mode 100644 index 0000000..f96ea24 --- /dev/null +++ b/tests/unittests/test_javacard.cap Binary files differ diff --git a/tests/unittests/test_javacard.py b/tests/unittests/test_javacard.py new file mode 100755 index 0000000..30d8bdd --- /dev/null +++ b/tests/unittests/test_javacard.py @@ -0,0 +1,18 @@ +#!/usr/bin/env python3 + +import os +import unittest +from pySim.javacard import * + +class TestJavacard(unittest.TestCase): + + def test_CapFile(self): + loadfile="01000fdecaffed010204000105d07002ca4402001f000f001f000c002800420018006d00320017000000a900040002002203010004002803020107a0000000620101060210a0000000090003ffffffff8910710002000107a000000062000103000c0108d07002ca44900101002006001843800301ff0007020000002f00398002008101010881000007006d000911188c00048d00012c18197b0002037b00029210240303038b000388007a02318f00053d8c00062e1b8b00077a0120188b000860037a7a02228d00092d1d10076b101a8b000a321fae006b06188c000b7a06118d000c2c1903077b000d037b000d928b000e198b000f3b7a08003200040002000203001857656c636f6d6520746f20546f6f7243616d70203230313203000a48656c6c6f2c2053544b0000000005004200100200000006810900050000020381090b0680030001000000060000010380030103800303068108000381080c0600005306810a000500000003810a1303810a1609001700021e2d0011050306040908040507090a0a06070404040b00a901000100000300030005800281018100ff080000000028ff08000002002800020000008003ff820001002f001d0000000000090020003f000d000000000701002f0042000800000000080100390046001800000000ff020053002f0018000000000010002200240028002a002fffff002f002f003100330022002f00370028003b002201300568109001b008b44323430110012005681080056810a00633b44104b431066800a10231" + cap = CapFile(os.path.dirname(os.path.abspath(__file__)) + "/test_javacard.cap") + self.assertTrue(cap.get_loadfile() == loadfile) + self.assertTrue(cap.get_loadfile_aid() == "d07002ca44") + self.assertTrue(cap.get_applet_aid() == "d07002ca44900101") + + +if __name__ == "__main__": + unittest.main() -- To view, visit https://gerrit.osmocom.org/c/pysim/+/39198?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I581483ccb9d8a254fcecc995fec3c811c5cf38eb Gerrit-Change-Number: 39198 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de>

1 0

[M] Change in pysim[master]: global_platform: add new command "install_cap"
by dexter 20 Dec '24

20 Dec '24

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/39199?usp=email ) Change subject: global_platform: add new command "install_cap" ...................................................................... global_platform: add new command "install_cap" Installing JAVA-card applets from a CAP file is a multi step process, which is difficult when done manually. Fortunately it is easy to automate the process, so let's add a dedicated command for that. Change-Id: I6cbd37f0fad5579b20e83c27349bd5acc129e6d0 Related: OS#6679 --- M pySim/global_platform/__init__.py A pySim/global_platform/install_param.py M tests/unittests/test_globalplatform.py 3 files changed, 131 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/99/39199/1 diff --git a/pySim/global_platform/__init__.py b/pySim/global_platform/__init__.py index 7898259..023e7f9 100644 --- a/pySim/global_platform/__init__.py +++ b/pySim/global_platform/__init__.py @@ -30,6 +30,7 @@ from pySim.utils import ResTuple from pySim.card_key_provider import card_key_provider_get_field from pySim.global_platform.scp import SCP02, SCP03 +from pySim.global_platform.install_param import gen_install_parameters from pySim.filesystem import * from pySim.profile import CardProfile from pySim.ota import SimFileAccessAndToolkitAppSpecParams @@ -859,6 +860,53 @@ _rsp_hex, _sw = self._cmd.lchan.scc.send_apdu_checksw(cmd_hex) self._cmd.poutput("Loaded a total of %u bytes in %u blocks. Don't forget install_for_install (and make selectable) now!" % (total_size, block_nr)) + install_cap_parser = argparse.ArgumentParser() + install_cap_parser.add_argument('cap_file', type=str, metavar='FILE', + help='JAVA-CARD CAP file to install') + install_cap_parser.add_argument('--install-parameters', type=is_hexstr, default='', + help='install Parameters (GPC_SPE_034, section 11.5.2.3.7, table 11-49)') + install_cap_parser.add_argument('--install-parameters-volatile-memory-quota', type=int, default=None, + help='install Parameters (GPC_SPE_034, section 11.5.2.3.7, table 11-49)') + install_cap_parser.add_argument('--install-parameters-non-volatile-memory-quota', type=int, default=None, + help='Install Parameters (GPC_SPE_034, section 11.5.2.3.7, table 11-49)') + install_cap_parser.add_argument('--install-parameters-stk', type=is_hexstr, default=None, + help='Load Parameters (ETSI TS 102 226, section 8.2.1.3.2.1)') + + @cmd2.with_argparser(install_cap_parser) + def do_install_cap(self, opts): + """Perform a .cap file installation using GlobalPlatform LOAD and INSTALL commands.""" + + self._cmd.poutput("loading cap file: %s ..." % opts.cap_file) + cap = CapFile(opts.cap_file) + + security_domain_aid = self._cmd.lchan.selected_file.aid + load_file = cap.get_loadfile() + load_file_aid = cap.get_loadfile_aid() + module_aid = cap.get_applet_aid() + application_aid = module_aid + if opts.install_parameters != '': + install_parameters = opts.install_parameters; + else: + install_parameters = gen_install_parameters(opts.install_parameters_non_volatile_memory_quota, + opts.install_parameters_volatile_memory_quota, + opts.install_parameters_stk) + self._cmd.poutput("parameters:") + self._cmd.poutput(" security-domain-aid: %s" % security_domain_aid) + self._cmd.poutput(" load-file: %u bytes" % (len(load_file) // 2)) + self._cmd.poutput(" load-file-aid: %s" % load_file_aid) + self._cmd.poutput(" module-aid: %s" % module_aid) + self._cmd.poutput(" application-aid: %s" % application_aid) + self._cmd.poutput(" install-parameters: %s" % install_parameters) + + self._cmd.poutput("step #1: install for load...") + self.do_install_for_load("--load-file-aid %s --security-domain-aid %s" % (load_file_aid, security_domain_aid)) + self._cmd.poutput("step #2: load...") + self.load(h2b(load_file)) + self._cmd.poutput("step #3: install_for_install (and make selectable)...") + self.do_install_for_install("--load-file-aid %s --module-aid %s --application-aid %s --install-parameters %s --make-selectable" % + (load_file_aid, module_aid, application_aid, install_parameters)) + self._cmd.poutput("done.") + est_scp02_parser = argparse.ArgumentParser() est_scp02_parser.add_argument('--key-ver', type=auto_uint8, required=True, help='Key Version Number (KVN)') est_scp02_parser.add_argument('--host-challenge', type=is_hexstr, diff --git a/pySim/global_platform/install_param.py b/pySim/global_platform/install_param.py new file mode 100644 index 0000000..0d1dfdb --- /dev/null +++ b/pySim/global_platform/install_param.py @@ -0,0 +1,74 @@ +# GlobalPlatform install parameter generator +# +# (C) 2024 by Sysmocom s.f.m.c. GmbH +# All Rights Reserved +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# + +from construct import Optional as COptional +from construct import Struct, GreedyRange, FlagsEnum, Int16ub, Int32ub, Padding, Bit, Const +from osmocom.construct import * +from osmocom.utils import * +from osmocom.tlv import * + +class AppSpecificParams(BER_TLV_IE, tag=0xC9): + # GPD_SPE_013, table 11-49 + _construct = HexAdapter(GreedyBytes) + +class VolatileMemoryQuota(BER_TLV_IE, tag=0xC7): + # GPD_SPE_013, table 11-49 + _construct = StripTrailerAdapter(GreedyBytes, 4, steps = [2,4], reverse = True) + +class NonVolatileMemoryQuota(BER_TLV_IE, tag=0xC8): + # GPD_SPE_013, table 11-49 + _construct = StripTrailerAdapter(GreedyBytes, 4, steps = [2,4], reverse = True) + +class StkParameter(BER_TLV_IE, tag=0xCA): + # GPD_SPE_013, table 11-49 + # ETSI TS 102 226, section 8.2.1.3.2.1 + _construct = HexAdapter(GreedyBytes) + +class SystemSpecificParams(BER_TLV_IE, tag=0xEF, nested=[VolatileMemoryQuota, NonVolatileMemoryQuota, StkParameter]): + # GPD_SPE_013 v1.1 Table 6-5 + pass + +class InstallParams(TLV_IE_Collection, nested=[AppSpecificParams, SystemSpecificParams]): + # GPD_SPE_013, table 11-49 + pass + +def gen_install_parameters(non_volatile_memory_quota:int, volatile_memory_quota:int, stk_parameter:str): + + # GPD_SPE_013, table 11-49 + + #Mandatory + install_params = InstallParams() + install_params_dict = [{'app_specific_params': None}] + + #Conditional + if non_volatile_memory_quota and volatile_memory_quota and stk_parameter: + system_specific_params = [] + #Optional + if non_volatile_memory_quota: + system_specific_params += [{'non_volatile_memory_quota': non_volatile_memory_quota}] + #Optional + if volatile_memory_quota: + system_specific_params += [{'volatile_memory_quota': volatile_memory_quota}] + #Optional + if stk_parameter: + system_specific_params += [{'stk_parameter': stk_parameter}] + install_params_dict += [{'system_specific_params': system_specific_params}] + + install_params.from_dict(install_params_dict) + return b2h(install_params.to_bytes()) diff --git a/tests/unittests/test_globalplatform.py b/tests/unittests/test_globalplatform.py index 597d51d..3c533d5 100644 --- a/tests/unittests/test_globalplatform.py +++ b/tests/unittests/test_globalplatform.py @@ -21,6 +21,7 @@ from pySim.global_platform import * from pySim.global_platform.scp import * +from pySim.global_platform.install_param import * KIC = h2b('100102030405060708090a0b0c0d0e0f') # enc KID = h2b('101102030405060708090a0b0c0d0e0f') # MAC @@ -289,5 +290,13 @@ self.assertEqual(compute_kcv('aes', KEYSET_AES128.dek), h2b('840DE5')) +class Install_param_Test(unittest.TestCase): + def test_gen_install_parameters(self): + load_parameters = gen_install_parameters(256, 256, '010001001505000000000000000000000000') + self.assertEqual(load_parameters, 'c900ef1cc8020100c7020100ca12010001001505000000000000000000000000') + + load_parameters = gen_install_parameters(None, None, '') + self.assertEqual(load_parameters, 'c900') + if __name__ == "__main__": unittest.main() -- To view, visit https://gerrit.osmocom.org/c/pysim/+/39199?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I6cbd37f0fad5579b20e83c27349bd5acc129e6d0 Gerrit-Change-Number: 39199 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de>

1 0

[M] Change in ...pyosmocom[master]: construct: allow stripping of leading zeros with StripTrailerAdapter
by dexter 20 Dec '24

20 Dec '24

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/python/pyosmocom/+/39193?usp=email to look at the new patch set (#2). Change subject: construct: allow stripping of leading zeros with StripTrailerAdapter ...................................................................... construct: allow stripping of leading zeros with StripTrailerAdapter The class StripTrailerAdapter is currently only able to strip zeros at the end of an integer. What it can not do is stripping leading zeros. Let's add a parameter for that and extend the unittests accordingly. Related: OS#6679 Change-Id: I1a9fff17abbbef0c5f6d45f58198debfa12e78b6 --- M src/osmocom/construct.py M tests/test_construct.py 2 files changed, 59 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/python/pyosmocom refs/changes/93/39193/2 -- To view, visit https://gerrit.osmocom.org/c/python/pyosmocom/+/39193?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: python/pyosmocom Gerrit-Branch: master Gerrit-Change-Id: I1a9fff17abbbef0c5f6d45f58198debfa12e78b6 Gerrit-Change-Number: 39193 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder

1 0

[M] Change in ...pyosmocom[master]: construct: allow stripping of leading zeros with StripTrailerAdapter
by dexter 20 Dec '24

20 Dec '24

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/python/pyosmocom/+/39193?usp=email ) Change subject: construct: allow stripping of leading zeros with StripTrailerAdapter ...................................................................... construct: allow stripping of leading zeros with StripTrailerAdapter The class StripTrailerAdapter is currently only able to strip zeros at the end of an integer. What it can not do is stripping leading zeros. Let's add a parameter for that and extend the unittests accordingly. Related: OS#6679 Change-Id: I1a9fff17abbbef0c5f6d45f58198debfa12e78b6 --- M src/osmocom/construct.py M tests/test_construct.py 2 files changed, 59 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/python/pyosmocom refs/changes/93/39193/1 diff --git a/src/osmocom/construct.py b/src/osmocom/construct.py index 1f5bd45..dd92165 100644 --- a/src/osmocom/construct.py +++ b/src/osmocom/construct.py @@ -420,19 +420,23 @@ where you have a bit-mask that may have 1, 2 or 3 bytes, depending on whether or not any of the LSBs are actually set. """ - def __init__(self, subcon, total_length:int, default_value=b'\x00', min_len=1, steps:[int]=[]): + def __init__(self, subcon, total_length:int, default_value=b'\x00', min_len=1, steps:[int]=[], reverse:bool = False): super().__init__(subcon) assert len(default_value) == 1 self.total_length = total_length self.default_value = default_value self.min_len = min_len self.steps = steps + self.reverse = reverse def _decode(self, obj, context, path): assert isinstance(obj, bytes) # pad with suppressed/missing bytes if len(obj) < self.total_length: - obj += self.default_value * (self.total_length - len(obj)) + if self.reverse: + obj = self.default_value * (self.total_length - len(obj)) + obj + else: + obj += self.default_value * (self.total_length - len(obj)) return int.from_bytes(obj, 'big') def _encode(self, obj, context, path): @@ -441,10 +445,16 @@ # remove trailing bytes if they are zero obj_step_aligned = obj - while len(obj) > self.min_len and obj[-1] == self.default_value[0]: - obj = obj[:-1] - if len(obj) in self.steps: - obj_step_aligned = obj + if self.reverse: + while len(obj) > self.min_len and obj[0] == self.default_value[0]: + obj = obj[1:] + if len(obj) in self.steps: + obj_step_aligned = obj + else: + while len(obj) > self.min_len and obj[-1] == self.default_value[0]: + obj = obj[:-1] + if len(obj) in self.steps: + obj_step_aligned = obj if self.steps == []: return obj diff --git a/tests/test_construct.py b/tests/test_construct.py index e4234db..4fb1a71 100755 --- a/tests/test_construct.py +++ b/tests/test_construct.py @@ -101,6 +101,11 @@ final_application=0x0200, global_service=0x0100, receipt_generation=0x80, ciphered_load_file_data_block=0x40, contactless_activation=0x20, contactless_self_activation=0x10) + IntegerSteps = StripTrailerAdapter(GreedyBytes, 4, steps = [2,4]) + Integer = StripTrailerAdapter(GreedyBytes, 4) + IntegerStepsReverse = StripTrailerAdapter(GreedyBytes, 4, steps = [2,4], reverse = True) + IntegerReverse = StripTrailerAdapter(GreedyBytes, 4, reverse = True) + examples = ['00', '80', '8040', '400010'] def test_encdec(self): for e in self.examples: @@ -108,6 +113,44 @@ reenc = self.Privileges.build(dec) self.assertEqual(e, b2h(reenc)) + def test_encdec_integer(self): + enc = self.IntegerSteps.build(0x10000000) + self.assertEqual(b2h(enc), '1000') + enc = self.IntegerSteps.build(0x10200000) + self.assertEqual(b2h(enc), '1020') + enc = self.IntegerSteps.build(0x10203000) + self.assertEqual(b2h(enc), '10203000') + enc = self.IntegerSteps.build(0x10203040) + self.assertEqual(b2h(enc), '10203040') + + enc = self.Integer.build(0x10000000) + self.assertEqual(b2h(enc), '10') + enc = self.Integer.build(0x10200000) + self.assertEqual(b2h(enc), '1020') + enc = self.Integer.build(0x10203000) + self.assertEqual(b2h(enc), '102030') + enc = self.Integer.build(0x10203040) + self.assertEqual(b2h(enc), '10203040') + + def test_encdec_integer_reverse(self): + enc = self.IntegerStepsReverse.build(0x40) + self.assertEqual(b2h(enc), '0040') + enc = self.IntegerStepsReverse.build(0x3040) + self.assertEqual(b2h(enc), '3040') + enc = self.IntegerStepsReverse.build(0x203040) + self.assertEqual(b2h(enc), '00203040') + enc = self.IntegerStepsReverse.build(0x10203040) + self.assertEqual(b2h(enc), '10203040') + + enc = self.IntegerReverse.build(0x40) + self.assertEqual(b2h(enc), '40') + enc = self.IntegerReverse.build(0x3040) + self.assertEqual(b2h(enc), '3040') + enc = self.IntegerReverse.build(0x203040) + self.assertEqual(b2h(enc), '203040') + enc = self.IntegerReverse.build(0x10203040) + self.assertEqual(b2h(enc), '10203040') + def test_enc(self): enc = self.Privileges.build({'dap_verification' : True}) self.assertEqual(b2h(enc), '40') -- To view, visit https://gerrit.osmocom.org/c/python/pyosmocom/+/39193?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: python/pyosmocom Gerrit-Branch: master Gerrit-Change-Id: I1a9fff17abbbef0c5f6d45f58198debfa12e78b6 Gerrit-Change-Number: 39193 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de>

1 0

[XS] Change in osmo-pcap[master]: pcap-server: remove unneeded check for null base_path
by pespin 20 Dec '24

20 Dec '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39192?usp=email ) Change subject: pcap-server: remove unneeded check for null base_path ...................................................................... pcap-server: remove unneeded check for null base_path It cannot be ever NULL. It is set to a non-null path during alloc(), and it can only be replaced with another string through VTY. Change-Id: I2f503f6f9af35d6ae6fbd03e85cade4f0eb93df2 --- M src/osmo_server_vty.c 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/92/39192/1 diff --git a/src/osmo_server_vty.c b/src/osmo_server_vty.c index 6a44da6..c3014c9 100644 --- a/src/osmo_server_vty.c +++ b/src/osmo_server_vty.c @@ -96,8 +96,7 @@ vty_out(vty, "server%s", VTY_NEWLINE); - if (pcap_server->base_path) - vty_out(vty, " base-path %s%s", pcap_server->base_path, VTY_NEWLINE); + vty_out(vty, " base-path %s%s", pcap_server->base_path, VTY_NEWLINE); vty_out(vty, " file-permission-mask 0%o%s", pcap_server->permission_mask, VTY_NEWLINE); if (pcap_server->addr) vty_out(vty, " server ip %s%s", pcap_server->addr, VTY_NEWLINE); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/39192?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I2f503f6f9af35d6ae6fbd03e85cade4f0eb93df2 Gerrit-Change-Number: 39192 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log