Ajout de la lecture de carte CPS dans le moteur SESAM-Vitale #29

Merged
florian_briand merged 11 commits from feature_ssv_lire_carte_ps into main 2024-08-03 14:57:58 +02:00
6 changed files with 425 additions and 653 deletions
Showing only changes of commit e9ef6cbb4b - Show all commits

View File

@ -0,0 +1,347 @@
use libc::{c_void, size_t};
use std::ffi::CString;
use std::ptr;
/*
1. CB = Caractères Binaires »
2. CE = Caractères « Etendus » (ISO 8859-1)
3. CA = Caractères Alphanumériques (ASCII?)
4. CN = Caractères Numériques
*/
florian_briand marked this conversation as resolved
Review
  • Déplacer ce bloc de commentaire en dessous des imports
  • Transformer en commentaires //
- [x] Déplacer ce bloc de commentaire en dessous des imports - [x] Transformer en commentaires `//`
use crate::libssv::SSV_LireCartePS;
use crate::ssv_memory::{decode_ssv_memory, Block};
#[derive(Debug, Default)]
pub struct CartePS {
titulaire: TitulairePS,
situations: Vec<SituationPS>,
}
#[derive(Debug, Default)]
struct TitulairePS {
type_de_carte_ps: String, // CN
type_d_identification_nationale: String, // CN
numero_d_identification_nationale: String, // CE - 8 -> 30
cle_du_numero_d_identification_nationale: String, // CN
code_civilite: String, // CN
nom_du_ps: String, // CE - 27
prenom_du_ps: String, // CE - 27
categorie_carte: char, // CA
}
#[derive(Debug, Default)]
struct SituationPS {
numero_logique_de_la_situation_de_facturation_du_ps: u8,
mode_d_exercice: String,
statut_d_exercice: String,
secteur_d_activite: String,
type_d_identification_structure: String,
numero_d_identification_structure: String,
cle_du_numero_d_identification_structure: String,
raison_sociale_structure: String,
numero_d_identification_de_facturation_du_ps: String,
cle_du_numero_d_identification_de_facturation_du_ps: String,
numero_d_identification_du_ps_remplaçant: String,
cle_du_numero_d_identification_du_ps_remplaçant: String,
code_conventionnel: String,
code_specialite: String,
code_zone_tarifaire: String,
code_zone_ik: String,
code_agrement_1: String,
code_agrement_2: String,
code_agrement_3: String,
habilitation_à_signer_une_facture: String,
habilitation_à_signer_un_lot: String,
}
pub fn lire_carte(code_pin: &str, lecteur: &str) -> CartePS {
let resource_ps = CString::new(lecteur).expect("CString::new failed");
let resource_reader = CString::new("").expect("CString::new failed");
let card_number = CString::new(code_pin).expect("CString::new failed");
let mut buffer: *mut c_void = ptr::null_mut();
let mut size: size_t = 0;
let mut hex_values: &[u8] = &[];
unsafe {
let result = SSV_LireCartePS(
resource_ps.as_ptr(),
resource_reader.as_ptr(),
card_number.as_ptr(),
&mut buffer,
&mut size,
);
println!("SSV_LireCartePS result: {}", result);
if !buffer.is_null() {
hex_values = std::slice::from_raw_parts(buffer as *const u8, size);
libc::free(buffer);
}
}
let groups = decode_ssv_memory(hex_values, hex_values.len());
decode_carte_ps(groups)
}
fn decode_carte_ps(groups: Vec<Block>) -> CartePS {
let mut carte_ps = CartePS::default();
for group in groups {
for (field_index, field) in group.content.iter().enumerate() {
match (group.id, field_index + 1) {
florian_briand marked this conversation as resolved
Review
  • Stocker l'index du champ dans l'objet field, il est structurel et on en aura besoin plus tard
- [x] Stocker l'index du champ dans l'objet `field`, il est structurel et on en aura besoin plus tard
(1, 1) => {
carte_ps.titulaire.type_de_carte_ps =
String::from_utf8_lossy(field.content).to_string();
}
(1, 2) => {
carte_ps.titulaire.type_d_identification_nationale =
String::from_utf8_lossy(field.content).to_string();
}
(1, 3) => {
carte_ps.titulaire.numero_d_identification_nationale =
String::from_utf8_lossy(field.content).to_string();
}
(1, 4) => {
carte_ps.titulaire.cle_du_numero_d_identification_nationale =
String::from_utf8_lossy(field.content).to_string();
}
(1, 5) => {
carte_ps.titulaire.code_civilite =
String::from_utf8_lossy(field.content).to_string();
}
(1, 6) => {
carte_ps.titulaire.nom_du_ps =
String::from_utf8_lossy(field.content).to_string();
}
(1, 7) => {
carte_ps.titulaire.prenom_du_ps =
String::from_utf8_lossy(field.content).to_string();
}
(1, 8) => {
let byte = field.content[0];
carte_ps.titulaire.categorie_carte = byte as char;
}
(2, 1) => {
florian_briand marked this conversation as resolved
Review
  • Gérer les index de groupe supérieurs à 2 (on peut avoir jusqu'à 16 situations)
- [x] Gérer les index de groupe supérieurs à 2 (on peut avoir jusqu'à 16 situations)
carte_ps.situations.push(SituationPS::default());
carte_ps
.situations
.last_mut()
.unwrap()
.numero_logique_de_la_situation_de_facturation_du_ps = field.content[0];
}
(2, 2) => {
carte_ps.situations.last_mut().unwrap().mode_d_exercice =
String::from_utf8_lossy(field.content).to_string();
}
(2, 3) => {
carte_ps.situations.last_mut().unwrap().statut_d_exercice =
String::from_utf8_lossy(field.content).to_string();
}
(2, 4) => {
carte_ps.situations.last_mut().unwrap().secteur_d_activite =
String::from_utf8_lossy(field.content).to_string();
}
(2, 5) => {
carte_ps
.situations
.last_mut()
.unwrap()
.type_d_identification_structure =
String::from_utf8_lossy(field.content).to_string();
}
(2, 6) => {
carte_ps
.situations
.last_mut()
.unwrap()
.numero_d_identification_structure =
String::from_utf8_lossy(field.content).to_string();
}
(2, 7) => {
carte_ps
.situations
.last_mut()
.unwrap()
.cle_du_numero_d_identification_structure =
String::from_utf8_lossy(field.content).to_string();
}
(2, 8) => {
carte_ps
.situations
.last_mut()
.unwrap()
.raison_sociale_structure =
String::from_utf8_lossy(field.content).to_string();
}
(2, 9) => {
carte_ps
.situations
.last_mut()
.unwrap()
.numero_d_identification_de_facturation_du_ps =
String::from_utf8_lossy(field.content).to_string();
}
(2, 10) => {
carte_ps
.situations
.last_mut()
.unwrap()
.cle_du_numero_d_identification_de_facturation_du_ps =
String::from_utf8_lossy(field.content).to_string();
}
(2, 11) => {
carte_ps
.situations
.last_mut()
.unwrap()
.numero_d_identification_du_ps_remplaçant =
String::from_utf8_lossy(field.content).to_string();
}
(2, 12) => {
carte_ps
.situations
.last_mut()
.unwrap()
.cle_du_numero_d_identification_du_ps_remplaçant =
String::from_utf8_lossy(field.content).to_string();
}
(2, 13) => {
carte_ps.situations.last_mut().unwrap().code_conventionnel =
String::from_utf8_lossy(field.content).to_string();
}
(2, 14) => {
carte_ps.situations.last_mut().unwrap().code_specialite =
String::from_utf8_lossy(field.content).to_string();
}
(2, 15) => {
carte_ps.situations.last_mut().unwrap().code_zone_tarifaire =
String::from_utf8_lossy(field.content).to_string();
}
(2, 16) => {
carte_ps.situations.last_mut().unwrap().code_zone_ik =
String::from_utf8_lossy(field.content).to_string();
}
(2, 17) => {
carte_ps.situations.last_mut().unwrap().code_agrement_1 =
String::from_utf8_lossy(field.content).to_string();
}
(2, 18) => {
carte_ps.situations.last_mut().unwrap().code_agrement_2 =
String::from_utf8_lossy(field.content).to_string();
}
(2, 19) => {
carte_ps.situations.last_mut().unwrap().code_agrement_3 =
String::from_utf8_lossy(field.content).to_string();
}
(2, 20) => {
carte_ps
.situations
.last_mut()
.unwrap()
.habilitation_à_signer_une_facture =
String::from_utf8_lossy(field.content).to_string();
}
(2, 21) => {
carte_ps
.situations
.last_mut()
.unwrap()
.habilitation_à_signer_un_lot =
String::from_utf8_lossy(field.content).to_string();
}
_ => (),
}
}
}
carte_ps
}
#[cfg(test)]
mod test_decode_carte_ps {
florian_briand marked this conversation as resolved
Review
  • Ajouter un test sur une CPS avec plusieurs situations
  • Ajouter des tests "todo!" avec des formats incorrects
- [x] Ajouter un test sur une CPS avec plusieurs situations - [x] Ajouter des tests "todo!" avec des formats incorrects
use super::*;
#[test]
fn test_francoise_pharmacien0052419() {
let bytes: &[u8] = &[
0, 1, 51, // 3
1, 48, // 2
1, 56, // 2
11, 57, 57, 55, 48, 48, 53, 50, 52, 49, 57, 52, // 12
1, 52, // 2
2, 50, 50, // 3
17, 80, 72, 65, 82, 77, 65, 67, 73, 69, 78, 48, 48, 53, 50, 52, 49, 57, // 18
9, 70, 82, 65, 78, 67, 79, 73, 83, 69, // 10
1, 84, // 2
// total: 54
0, 2, 83, 1, 1, 1, 48, 1, 49, 2, 56, 54, 1, 49, 9, 48, 66, 48, 50, 50, 49, 57, 53, 56,
1, 56, 24, 80, 72, 65, 82, 77, 65, 67, 73, 69, 32, 68, 85, 32, 67, 69, 78, 84, 82, 69,
50, 50, 49, 57, 53, 8, 48, 48, 50, 48, 50, 52, 49, 57, 1, 56, 0, 1, 48, 1, 49, 2, 53,
48, 2, 49, 48, 2, 48, 48, 1, 48, 1, 48, 1, 48, 1, 49, 1, 49,
];
let blocks = decode_ssv_memory(bytes, bytes.len());
let carte_ps = decode_carte_ps(blocks);
assert_eq!(carte_ps.titulaire.type_de_carte_ps, "0");
assert_eq!(carte_ps.titulaire.type_d_identification_nationale, "8");
assert_eq!(
carte_ps.titulaire.numero_d_identification_nationale,
"99700524194"
);
assert_eq!(
carte_ps.titulaire.cle_du_numero_d_identification_nationale,
"4"
);
assert_eq!(carte_ps.titulaire.code_civilite, "22");
assert_eq!(carte_ps.titulaire.nom_du_ps, "PHARMACIEN0052419");
assert_eq!(carte_ps.titulaire.prenom_du_ps, "FRANCOISE");
assert_eq!(carte_ps.titulaire.categorie_carte, 'T');
assert_eq!(carte_ps.situations.len(), 1);
assert_eq!(
carte_ps.situations[0].numero_logique_de_la_situation_de_facturation_du_ps,
1
);
assert_eq!(carte_ps.situations[0].mode_d_exercice, "0");
assert_eq!(carte_ps.situations[0].statut_d_exercice, "1");
assert_eq!(carte_ps.situations[0].secteur_d_activite, "86");
assert_eq!(carte_ps.situations[0].type_d_identification_structure, "1");
assert_eq!(
carte_ps.situations[0].numero_d_identification_structure,
"0B0221958"
);
assert_eq!(
carte_ps.situations[0].cle_du_numero_d_identification_structure,
"8"
);
assert_eq!(
carte_ps.situations[0].raison_sociale_structure,
"PHARMACIE DU CENTRE22195"
);
assert_eq!(
carte_ps.situations[0].numero_d_identification_de_facturation_du_ps,
"00202419"
);
assert_eq!(
carte_ps.situations[0].cle_du_numero_d_identification_de_facturation_du_ps,
"8"
);
assert_eq!(
carte_ps.situations[0].numero_d_identification_du_ps_remplaçant,
""
);
assert_eq!(
carte_ps.situations[0].cle_du_numero_d_identification_du_ps_remplaçant,
"0"
);
assert_eq!(carte_ps.situations[0].code_conventionnel, "1");
assert_eq!(carte_ps.situations[0].code_specialite, "50");
assert_eq!(carte_ps.situations[0].code_zone_tarifaire, "10");
assert_eq!(carte_ps.situations[0].code_zone_ik, "00");
assert_eq!(carte_ps.situations[0].code_agrement_1, "0");
assert_eq!(carte_ps.situations[0].code_agrement_2, "0");
assert_eq!(carte_ps.situations[0].code_agrement_3, "0");
assert_eq!(
carte_ps.situations[0].habilitation_à_signer_une_facture,
"1"
);
assert_eq!(carte_ps.situations[0].habilitation_à_signer_un_lot, "1");
}
}

View File

@ -1,3 +1,8 @@
pub mod cps;
pub mod libssv;
pub mod ssv_memory;
pub mod ssvlib_demo;
pub fn add(left: usize, right: usize) -> usize { pub fn add(left: usize, right: usize) -> usize {
left + right left + right
} }

View File

@ -4,14 +4,22 @@
* Low level bindings to the SSVLIB dynamic library. * Low level bindings to the SSVLIB dynamic library.
* TODO : look for creating a dedicated *-sys crate : https://kornel.ski/rust-sys-crate * TODO : look for creating a dedicated *-sys crate : https://kornel.ski/rust-sys-crate
*/ */
florian_briand marked this conversation as resolved
Review
  • Transformer ce commentaire en docstring ///
- [x] Transformer ce commentaire en docstring `///`
use libc::{c_char, c_ushort, c_void, size_t};
use libc::{ c_char, c_void, c_ushort, size_t };
#[cfg_attr(target_os = "linux", link(name = "ssvlux64"))] #[cfg_attr(target_os = "linux", link(name = "ssvlux64"))]
#[cfg_attr(target_os = "windows", link(name = "ssvw64"))] #[cfg_attr(target_os = "windows", link(name = "ssvw64"))]
extern "C" { extern "C" {
pub fn SSV_InitLIB2(pcRepSesamIni: *const c_char) -> c_ushort; pub fn SSV_InitLIB2(pcRepSesamIni: *const c_char) -> c_ushort;
pub fn SSV_LireCartePS(NomRessourcePS: *const c_char, NomRessourceLecteur: *const c_char, CodePorteurPS: *const c_char, ZDonneesSortie: *mut *mut c_void, TTailleDonneesSortie: *mut size_t) -> c_ushort; pub fn SSV_LireCartePS(
pub fn SSV_LireConfig(ZDonneesSortie: *mut *mut c_void, TTailleDonneesSortie: *mut size_t) -> c_ushort; NomRessourcePS: *const c_char,
NomRessourceLecteur: *const c_char,
CodePorteurPS: *const c_char,
ZDonneesSortie: *mut *mut c_void,
TTailleDonneesSortie: *mut size_t,
) -> c_ushort;
pub fn SSV_LireConfig(
ZDonneesSortie: *mut *mut c_void,
TTailleDonneesSortie: *mut size_t,
) -> c_ushort;
} }
/* TODO : replace void* by Rust struct : https://doc.rust-lang.org/nomicon/ffi.html#representing-opaque-structs */ /* TODO : replace void* by Rust struct : https://doc.rust-lang.org/nomicon/ffi.html#representing-opaque-structs */

View File

@ -1,6 +1,7 @@
mod ssvlib_demo; mod cps;
mod libssv; mod libssv;
mod ssv_memory; mod ssv_memory;
mod ssvlib_demo;
fn main() { fn main() {
ssvlib_demo::demo(); ssvlib_demo::demo();

View File

@ -1,11 +1,11 @@
/** /// # SSV Memory
* Provide functions to manipulate raw memory from SSV library. /// Provide functions to manipulate raw memory from SSV library.
*/ ///
// TODO : Est-ce qu'on pourrait/devrait définir un type custom pour représenter les tableaux de bytes ?
use std::convert::TryFrom; use std::convert::TryFrom;
// TODO : Est-ce qu'on pourrait/devrait définir un type custom pour représenter les tableaux de bytes ?
#[derive(PartialEq, Debug)] #[derive(PartialEq, Debug)]
struct ElementSize { struct ElementSize {
pub size: usize, pub size: usize,
@ -16,11 +16,11 @@ impl TryFrom<&[u8]> for ElementSize {
type Error = &'static str; type Error = &'static str;
fn try_from(bytes: &[u8]) -> Result<Self, Self::Error> { fn try_from(bytes: &[u8]) -> Result<Self, Self::Error> {
/* Longueur: /* Longueur:
* - si le bit de poids fort du premier octet est à 0, la longueur est codée sur un octet * - si le bit de poids fort du premier octet est à 0, la longueur est codée sur un octet
* - si le bit de poids fort du premier octet est à 1, les 7 bits de poids faible codent le nombre d'octets utilisés pour coder la longueur * - si le bit de poids fort du premier octet est à 1, les 7 bits de poids faible codent le nombre d'octets utilisés pour coder la longueur
*/ */
if bytes.len() == 0 { if bytes.is_empty() {
return Err("Empty bytes input"); return Err("Empty bytes input");
} }
@ -41,7 +41,7 @@ impl TryFrom<&[u8]> for ElementSize {
// u32::from_be_bytes() requires a 4 bytes array // u32::from_be_bytes() requires a 4 bytes array
let mut padded_bytes = [0u8; 4]; let mut padded_bytes = [0u8; 4];
padded_bytes[size_bytes_len..].copy_from_slice(&size_bytes); padded_bytes[size_bytes_len..].copy_from_slice(size_bytes);
element_size.size = u32::from_be_bytes(padded_bytes) as usize; element_size.size = u32::from_be_bytes(padded_bytes) as usize;
element_size.pad += size_bytes_len; element_size.pad += size_bytes_len;
@ -62,7 +62,10 @@ impl<'a> From<&'a [u8]> for Block<'a> {
let mut offset = 0; let mut offset = 0;
let id = u16::from_be_bytes(bytes[..2].try_into().unwrap()); let id = u16::from_be_bytes(bytes[..2].try_into().unwrap());
offset += 2; offset += 2;
let ElementSize { size: block_size, pad } = bytes[2..].try_into().unwrap(); let ElementSize {
size: block_size,
pad,
} = bytes[2..].try_into().unwrap();
offset += pad; offset += pad;
let raw_content = &bytes[offset..]; let raw_content = &bytes[offset..];
let mut field_offset = 0; let mut field_offset = 0;
@ -90,9 +93,9 @@ pub struct Field<'a> {
impl<'a> From<&'a [u8]> for Field<'a> { impl<'a> From<&'a [u8]> for Field<'a> {
fn from(bytes: &'a [u8]) -> Self { fn from(bytes: &'a [u8]) -> Self {
let ElementSize { size, pad } = bytes.try_into().unwrap(); let ElementSize { size, pad } = bytes.try_into().unwrap();
let contenu = &bytes[pad..pad+size]; let contenu = &bytes[pad..pad + size];
Field { Field {
size: pad+size, size: pad + size,
content: contenu, content: contenu,
} }
} }
@ -138,10 +141,7 @@ mod test_element_size {
fn null_size() { fn null_size() {
let bytes: &[u8] = &[]; let bytes: &[u8] = &[];
let result: Result<ElementSize, &str> = bytes.try_into(); let result: Result<ElementSize, &str> = bytes.try_into();
assert_eq!( assert_eq!(result, Err("Empty bytes input"),);
result,
Err("Empty bytes input"),
);
} }
#[test] #[test]
@ -162,10 +162,7 @@ mod test_element_size {
let bytes: &[u8] = &[0b_1000_0101_u8, 1, 1, 1, 1, 1]; let bytes: &[u8] = &[0b_1000_0101_u8, 1, 1, 1, 1, 1];
let result: Result<ElementSize, &str> = bytes.try_into(); let result: Result<ElementSize, &str> = bytes.try_into();
assert_eq!( assert_eq!(result, Err("Invalid memory: size is too big"),);
result,
Err("Invalid memory: size is too big"),
);
} }
} }
@ -175,28 +172,27 @@ mod test_field {
#[test] #[test]
fn short_size() { fn short_size() {
let bytes: &[u8] = &[51, let bytes: &[u8] = &[
1, 48, 1, 56, 11, 57, 57, 55, 48, 48, 51, 1, 48, 1, 56, 11, 57, 57, 55, 48, 48, 53, 50, 52, 49, 57, 52, 1, 52, 2, 50, 50, 17,
53, 50, 52, 49, 57, 52, 1, 52, 2, 50, 80, 72, 65, 82, 77, 65, 67, 73, 69, 78, 48, 48, 53, 50, 52, 49, 57, 9, 70, 82, 65, 78,
50, 17, 80, 72, 65, 82, 77, 65, 67, 73, 67, 79, 73, 83, 69, 1, 84,
69, 78, 48, 48, 53, 50, 52, 49, 57, 9,
70, 82, 65, 78, 67, 79, 73, 83, 69, 1,
84,
]; ];
let element: Field = bytes.try_into().unwrap(); let element: Field = bytes.into();
assert_eq!(element.size, 52); assert_eq!(element.size, 52);
assert_eq!(element.content[..5], [1, 48, 1, 56, 11]); assert_eq!(element.content[..5], [1, 48, 1, 56, 11]);
} }
#[test] #[test]
fn long_size() { fn long_size() {
let mut bytes_vec = vec![0b_1000_0010_u8, let mut bytes_vec = vec![
0b_0000_0001_u8, 0b_0000_0000_u8, // size = 256 0b_1000_0010_u8,
0b_0000_0001_u8,
0b_0000_0000_u8, // size = 256
]; ];
// Add 256 bytes to the content // Add 256 bytes to the content
bytes_vec.append(&mut vec![1; 256]); bytes_vec.append(&mut vec![1; 256]);
let bytes: &[u8] = &bytes_vec; let bytes: &[u8] = &bytes_vec;
let element: Field = bytes.try_into().unwrap(); let element: Field = bytes.into();
assert_eq!(element.size, 259); assert_eq!(element.size, 259);
assert_eq!(element.content.len(), 256); assert_eq!(element.content.len(), 256);
} }
@ -208,11 +204,7 @@ mod test_block {
#[test] #[test]
fn test_francoise_pharmacien0052419_partial_block_1() { fn test_francoise_pharmacien0052419_partial_block_1() {
let bytes: &[u8] = &[ let bytes: &[u8] = &[1, 48, 1, 56, 11, 57, 57, 55, 48, 48, 53, 50, 52, 49, 57, 52];
1, 48,
1, 56,
11, 57, 57, 55, 48, 48, 53, 50, 52, 49, 57, 52,
];
let field1: Field = bytes.into(); let field1: Field = bytes.into();
assert_eq!(field1.size, 2); assert_eq!(field1.size, 2);
@ -224,13 +216,16 @@ mod test_block {
let field3: Field = bytes[field1.size + field2.size..].into(); let field3: Field = bytes[field1.size + field2.size..].into();
assert_eq!(field3.size, 12); assert_eq!(field3.size, 12);
assert_eq!(field3.content, &[57, 57, 55, 48, 48, 53, 50, 52, 49, 57, 52]); assert_eq!(
field3.content,
&[57, 57, 55, 48, 48, 53, 50, 52, 49, 57, 52]
);
} }
#[test] #[test]
fn test_francoise_pharmacien0052419() { fn test_francoise_pharmacien0052419() {
let bytes: &[u8] = &[ let bytes: &[u8] = &[
0, 1, 51, // 3 0, 1, 51, // 3
1, 48, // 2 1, 48, // 2
1, 56, // 2 1, 56, // 2
11, 57, 57, 55, 48, 48, 53, 50, 52, 49, 57, 52, // 12 11, 57, 57, 55, 48, 48, 53, 50, 52, 49, 57, 52, // 12
@ -239,30 +234,11 @@ mod test_block {
17, 80, 72, 65, 82, 77, 65, 67, 73, 69, 78, 48, 48, 53, 50, 52, 49, 57, // 18 17, 80, 72, 65, 82, 77, 65, 67, 73, 69, 78, 48, 48, 53, 50, 52, 49, 57, // 18
9, 70, 82, 65, 78, 67, 79, 73, 83, 69, // 10 9, 70, 82, 65, 78, 67, 79, 73, 83, 69, // 10
1, 84, // 2 1, 84, // 2
// total: 54 // total: 54
0, 2, 83, 1, 1, 1, 48, 1, 49, 2, 56, 54, 1, 49, 9, 48, 66, 48, 50, 50, 49, 57, 53, 56,
0, 2, 83, 1, 56, 24, 80, 72, 65, 82, 77, 65, 67, 73, 69, 32, 68, 85, 32, 67, 69, 78, 84, 82, 69,
1, 1, 50, 50, 49, 57, 53, 8, 48, 48, 50, 48, 50, 52, 49, 57, 1, 56, 0, 1, 48, 1, 49, 2, 53,
1, 48, 48, 2, 49, 48, 2, 48, 48, 1, 48, 1, 48, 1, 48, 1, 49, 1, 49,
1, 49,
2, 56, 54,
1, 49,
9, 48, 66, 48, 50, 50, 49, 57, 53, 56,
1, 56,
24, 80, 72, 65, 82, 77, 65, 67, 73, 69, 32, 68, 85, 32, 67, 69, 78, 84, 82, 69, 50, 50, 49, 57, 53,
8, 48, 48, 50, 48, 50, 52, 49, 57,
1, 56,
0,
1, 48,
1, 49,
2, 53, 48,
2, 49, 48,
2, 48, 48,
1, 48,
1, 48,
1, 48,
1, 49,
1, 49,
]; ];
let first_block: Block = bytes.into(); let first_block: Block = bytes.into();
@ -284,7 +260,7 @@ mod test_decode_ssv_memory {
#[test] #[test]
fn test_francoise_pharmacien0052419() { fn test_francoise_pharmacien0052419() {
let bytes: &[u8] = &[ let bytes: &[u8] = &[
0, 1, 51, // 3 0, 1, 51, // 3
1, 48, // 2 1, 48, // 2
1, 56, // 2 1, 56, // 2
11, 57, 57, 55, 48, 48, 53, 50, 52, 49, 57, 52, // 12 11, 57, 57, 55, 48, 48, 53, 50, 52, 49, 57, 52, // 12
@ -293,32 +269,13 @@ mod test_decode_ssv_memory {
17, 80, 72, 65, 82, 77, 65, 67, 73, 69, 78, 48, 48, 53, 50, 52, 49, 57, // 18 17, 80, 72, 65, 82, 77, 65, 67, 73, 69, 78, 48, 48, 53, 50, 52, 49, 57, // 18
9, 70, 82, 65, 78, 67, 79, 73, 83, 69, // 10 9, 70, 82, 65, 78, 67, 79, 73, 83, 69, // 10
1, 84, // 2 1, 84, // 2
// total: 54 // total: 54
0, 2, 83, 1, 1, 1, 48, 1, 49, 2, 56, 54, 1, 49, 9, 48, 66, 48, 50, 50, 49, 57, 53, 56,
0, 2, 83, 1, 56, 24, 80, 72, 65, 82, 77, 65, 67, 73, 69, 32, 68, 85, 32, 67, 69, 78, 84, 82, 69,
1, 1, 50, 50, 49, 57, 53, 8, 48, 48, 50, 48, 50, 52, 49, 57, 1, 56, 0, 1, 48, 1, 49, 2, 53,
1, 48, 48, 2, 49, 48, 2, 48, 48, 1, 48, 1, 48, 1, 48, 1, 49, 1, 49,
1, 49,
2, 56, 54,
1, 49,
9, 48, 66, 48, 50, 50, 49, 57, 53, 56,
1, 56,
24, 80, 72, 65, 82, 77, 65, 67, 73, 69, 32, 68, 85, 32, 67, 69, 78, 84, 82, 69, 50, 50, 49, 57, 53,
8, 48, 48, 50, 48, 50, 52, 49, 57,
1, 56,
0,
1, 48,
1, 49,
2, 53, 48,
2, 49, 48,
2, 48, 48,
1, 48,
1, 48,
1, 48,
1, 49,
1, 49,
]; ];
let blocks = decode_ssv_memory(&bytes, bytes.len()); let blocks = decode_ssv_memory(bytes, bytes.len());
assert_eq!(blocks.len(), 2); assert_eq!(blocks.len(), 2);
} }
} }

View File

@ -1,19 +1,19 @@
extern crate dotenv; extern crate dotenv;
use libc::{c_void, size_t};
/** /**
* High level API for the SSV library, * High level API for the SSV library,
* based on the low level bindings in libssv.rs. * based on the low level bindings in libssv.rs.
* *
*/ */
extern crate libc;
use libc::{c_void, size_t};
use std::ffi::CString;
use std::path::PathBuf; use std::path::PathBuf;
use std::ffi::CString;
use std::ptr; use std::ptr;
use std::env; use std::env;
use crate::libssv::{SSV_InitLIB2, SSV_LireCartePS, SSV_LireConfig}; use crate::cps::lire_carte;
use crate::libssv::{SSV_InitLIB2, SSV_LireConfig};
fn ssv_init_lib_2() { fn ssv_init_lib_2() {
let ini_str = env::var("SESAM_INI_PATH").expect("SESAM_INI_PATH must be set"); let ini_str = env::var("SESAM_INI_PATH").expect("SESAM_INI_PATH must be set");
@ -24,377 +24,6 @@ fn ssv_init_lib_2() {
} }
} }
/*
1. CB = Caractères Binaires »
2. CE = Caractères « Etendus » (ISO 8859-1)
3. CA = Caractères Alphanumériques (ASCII?)
4. CN = Caractères Numériques
*/
#[derive(Debug)]
struct CartePS {
titulaire: TitulairePS,
situations: Vec<SituationPS>,
}
#[derive(Debug)]
struct TitulairePS {
type_de_carte_ps: String, // CN
type_d_identification_nationale: String, // CN
numero_d_identification_nationale: String, // CE - 8 -> 30
cle_du_numero_d_identification_nationale: String, // CN
code_civilite: String, // CN
nom_du_ps: String, // CE - 27
prenom_du_ps: String, // CE - 27
categorie_carte: char, // CA
}
#[derive(Debug)]
struct SituationPS {
numero_logique_de_la_situation_de_facturation_du_ps: u8,
mode_d_exercice: String,
statut_d_exercice: String,
secteur_d_activite: String,
type_d_identification_structure: String,
numero_d_identification_structure: String,
cle_du_numero_d_identification_structure: String,
raison_sociale_structure: String,
numero_d_identification_de_facturation_du_ps: String,
cle_du_numero_d_identification_de_facturation_du_ps: String,
numero_d_identification_du_ps_remplaçant: String,
cle_du_numero_d_identification_du_ps_remplaçant: String,
code_conventionnel: String,
code_specialite: String,
code_zone_tarifaire: String,
code_zone_ik: String,
code_agrement_1: String,
code_agrement_2: String,
code_agrement_3: String,
habilitation_à_signer_une_facture: String,
habilitation_à_signer_un_lot: String,
}
impl Default for SituationPS {
fn default() -> Self {
Self {
numero_logique_de_la_situation_de_facturation_du_ps: 0,
mode_d_exercice: String::new(),
statut_d_exercice: String::new(),
secteur_d_activite: String::new(),
type_d_identification_structure: String::new(),
numero_d_identification_structure: String::new(),
cle_du_numero_d_identification_structure: String::new(),
raison_sociale_structure: String::new(),
numero_d_identification_de_facturation_du_ps: String::new(),
cle_du_numero_d_identification_de_facturation_du_ps: String::new(),
numero_d_identification_du_ps_remplaçant: String::new(),
cle_du_numero_d_identification_du_ps_remplaçant: String::new(),
code_conventionnel: String::new(),
code_specialite: String::new(),
code_zone_tarifaire: String::new(),
code_zone_ik: String::new(),
code_agrement_1: String::new(),
code_agrement_2: String::new(),
code_agrement_3: String::new(),
habilitation_à_signer_une_facture: String::new(),
habilitation_à_signer_un_lot: String::new(),
}
}
}
fn ssv_lire_carte_ps(code_pin :&str, lecteur :&str) {
let resource_ps =
CString::new(lecteur).expect("CString::new failed");
let resource_reader = CString::new("").expect("CString::new failed");
let card_number = CString::new(code_pin).expect("CString::new failed");
let mut buffer: *mut c_void = ptr::null_mut();
let mut size: size_t = 0;
let mut hex_values: &[u8] = &[];
unsafe {
let result = SSV_LireCartePS(
resource_ps.as_ptr(),
resource_reader.as_ptr(),
card_number.as_ptr(),
&mut buffer,
&mut size,
);
println!("SSV_LireCartePS result: {}", result);
if !buffer.is_null() {
hex_values = std::slice::from_raw_parts(buffer as *const u8, size);
libc::free(buffer);
}
}
decode_zone_memoire(hex_values);
/* IDÉE : implémenter decode_zone_memoire sous forme d'itérateur
for (group, group_rank) in decode_zone_memoire(...) {
for (field, field_rank) in group {
match group_rank {
GROUP_1: {
match field_rank {
1 => carte_ps.titulaire.type_de_carte_ps = field.into(),
2 => carte_ps.titulaire.type_d_identification_nationale = field.into(),
3 => carte_ps.titulaire.numero_d_identification_nationale = field.into(),
4 => carte_ps.titulaire.cle_du_numero_d_identification_nationale = field.into(),
5 => carte_ps.titulaire.code_civilite = field.into(),
6 => carte_ps.titulaire.nom_du_ps = field.into(),
7 => carte_ps.titulaire.prenom_du_ps = field.into(),
8 => carte_ps.titulaire.categorie_carte = field.into(),
_ => (),
}
}
GROUP_2: {
match field_rank {
...
}
}
}
}
}
*/
}
/**
* Options possibles :
* - Passer un objet de type variable (CartePS, CarteVitale...) et le remplir intelligemment
* - Retourner un itérateur et faire le remplissage en dehors de decode_zone_memoire
*/
pub fn decode_zone_memoire(bytes: &[u8]) {
// Maintenant, vous pouvez accéder aux octets individuels dans `donnees`
let mut current_pos_general = 0;
let mut current_groupe = 0;
let mut num_champ = 0;
let mut carte_ps = CartePS {
titulaire: TitulairePS {
type_de_carte_ps: String::new(),
type_d_identification_nationale: String::new(),
numero_d_identification_nationale: String::new(),
cle_du_numero_d_identification_nationale: String::new(),
code_civilite: String::new(),
nom_du_ps: String::new(),
prenom_du_ps: String::new(),
categorie_carte: ' ',
},
situations: Vec::new(),
};
while current_pos_general < bytes.len() - 1 {
num_champ = 0;
current_groupe =
256 * bytes[current_pos_general] as i32 + bytes[current_pos_general + 1] as i32;
current_pos_general += 2;
let longueur_groupe: usize;
if bytes[current_pos_general] < 128 {
longueur_groupe = bytes[current_pos_general] as usize;
} else {
let nbre_octets_longueur = bytes[current_pos_general] - 128;
longueur_groupe = (0..nbre_octets_longueur).fold(0, |acc, i| {
current_pos_general += 1;
acc + (256_i32.pow(i as u32) * bytes[current_pos_general] as i32) as usize
});
}
current_pos_general += 1;
let mut current_pos_groupe = 0;
while current_pos_groupe < longueur_groupe {
num_champ += 1;
let longueur_champs: usize;
let nbre_octets_longueur: usize;
if bytes[current_pos_general] < 128 {
longueur_champs = bytes[current_pos_general] as usize;
nbre_octets_longueur = 1;
} else {
nbre_octets_longueur = bytes[current_pos_general] as usize - 128;
longueur_champs = (0..nbre_octets_longueur).fold(0, |acc, i| {
current_pos_general += 1;
current_pos_groupe += 1;
acc + (256_i32.pow(i as u32) * bytes[current_pos_general] as i32) as usize
});
}
let mut bytes_champ = vec![0; longueur_champs];
if longueur_champs > 0 {
bytes_champ.copy_from_slice(
&bytes[current_pos_general + nbre_octets_longueur
..current_pos_general + nbre_octets_longueur + longueur_champs],
);
match current_groupe {
1 => match num_champ {
1 => {
carte_ps.titulaire.type_de_carte_ps =
String::from_utf8_lossy(&bytes_champ).to_string();
}
2 => {
carte_ps.titulaire.type_d_identification_nationale =
String::from_utf8_lossy(&bytes_champ).to_string();
}
3 => {
carte_ps.titulaire.numero_d_identification_nationale =
String::from_utf8_lossy(&bytes_champ).to_string();
}
4 => {
carte_ps.titulaire.cle_du_numero_d_identification_nationale =
String::from_utf8_lossy(&bytes_champ).to_string();
}
5 => {
carte_ps.titulaire.code_civilite =
String::from_utf8_lossy(&bytes_champ).to_string();
}
6 => {
carte_ps.titulaire.nom_du_ps =
String::from_utf8_lossy(&bytes_champ).to_string();
}
7 => {
carte_ps.titulaire.prenom_du_ps =
String::from_utf8_lossy(&bytes_champ).to_string();
}
8 => {
carte_ps.titulaire.categorie_carte = bytes_champ[0] as char;
}
_ => (),
},
2 => match num_champ {
1 => {
carte_ps.situations.push(SituationPS::default());
carte_ps
.situations
.last_mut()
.unwrap()
.numero_logique_de_la_situation_de_facturation_du_ps =
bytes_champ[0];
}
2 => {
carte_ps.situations.last_mut().unwrap().mode_d_exercice =
String::from_utf8_lossy(&bytes_champ).to_string();
}
3 => {
carte_ps.situations.last_mut().unwrap().statut_d_exercice =
String::from_utf8_lossy(&bytes_champ).to_string();
}
4 => {
carte_ps.situations.last_mut().unwrap().secteur_d_activite =
String::from_utf8_lossy(&bytes_champ).to_string();
}
5 => {
carte_ps
.situations
.last_mut()
.unwrap()
.type_d_identification_structure =
String::from_utf8_lossy(&bytes_champ).to_string();
}
6 => {
carte_ps
.situations
.last_mut()
.unwrap()
.numero_d_identification_structure =
String::from_utf8_lossy(&bytes_champ).to_string();
}
7 => {
carte_ps
.situations
.last_mut()
.unwrap()
.cle_du_numero_d_identification_structure =
String::from_utf8_lossy(&bytes_champ).to_string();
}
8 => {
carte_ps
.situations
.last_mut()
.unwrap()
.raison_sociale_structure =
String::from_utf8_lossy(&bytes_champ).to_string();
}
9 => {
carte_ps
.situations
.last_mut()
.unwrap()
.numero_d_identification_de_facturation_du_ps =
String::from_utf8_lossy(&bytes_champ).to_string();
}
10 => {
carte_ps
.situations
.last_mut()
.unwrap()
.cle_du_numero_d_identification_de_facturation_du_ps =
String::from_utf8_lossy(&bytes_champ).to_string();
}
11 => {
carte_ps
.situations
.last_mut()
.unwrap()
.numero_d_identification_du_ps_remplaçant =
String::from_utf8_lossy(&bytes_champ).to_string();
}
12 => {
carte_ps
.situations
.last_mut()
.unwrap()
.cle_du_numero_d_identification_du_ps_remplaçant =
String::from_utf8_lossy(&bytes_champ).to_string();
}
13 => {
carte_ps.situations.last_mut().unwrap().code_conventionnel =
String::from_utf8_lossy(&bytes_champ).to_string();
}
14 => {
carte_ps.situations.last_mut().unwrap().code_specialite =
String::from_utf8_lossy(&bytes_champ).to_string();
}
15 => {
carte_ps.situations.last_mut().unwrap().code_zone_tarifaire =
String::from_utf8_lossy(&bytes_champ).to_string();
}
16 => {
carte_ps.situations.last_mut().unwrap().code_zone_ik =
String::from_utf8_lossy(&bytes_champ).to_string();
}
17 => {
carte_ps.situations.last_mut().unwrap().code_agrement_1 =
String::from_utf8_lossy(&bytes_champ).to_string();
}
18 => {
carte_ps.situations.last_mut().unwrap().code_agrement_2 =
String::from_utf8_lossy(&bytes_champ).to_string();
}
19 => {
carte_ps.situations.last_mut().unwrap().code_agrement_3 =
String::from_utf8_lossy(&bytes_champ).to_string();
}
20 => {
carte_ps.situations.last_mut().unwrap().habilitation_à_signer_une_facture =
String::from_utf8_lossy(&bytes_champ).to_string();
}
21 => {
carte_ps.situations.last_mut().unwrap().habilitation_à_signer_un_lot =
String::from_utf8_lossy(&bytes_champ).to_string();
}
_ => (),
},
_ => (),
}
}
current_pos_general += longueur_champs + nbre_octets_longueur;
current_pos_groupe += longueur_champs + nbre_octets_longueur;
}
}
println!("CartePS: {:#?}", carte_ps);
}
fn ssv_lire_config() { fn ssv_lire_config() {
let mut buffer: *mut c_void = ptr::null_mut(); let mut buffer: *mut c_void = ptr::null_mut();
let mut size: size_t = 0; let mut size: size_t = 0;
@ -428,185 +57,10 @@ pub fn demo() {
ssv_init_lib_2(); ssv_init_lib_2();
let code_pin = "1234"; let code_pin = "1234";
let lecteur = "HID Global OMNIKEY 3x21 Smart Card Reader 0"; let lecteur = "HID Global OMNIKEY 3x21 Smart Card Reader 0";
let carte_ps = ssv_lire_carte_ps2(code_pin, lecteur); let carte_ps = lire_carte(code_pin, lecteur);
println!("CartePS: {:#?}", carte_ps); println!("CartePS: {:#?}", carte_ps);
// ssv_lire_config();
ssv_lire_config();
println!("-----------------------------------------"); println!("-----------------------------------------");
} }
struct field{
rank : i32,
value : Vec<u8>
}
impl Default for field {
fn default() -> Self {
Self {rank: 0,
value: Vec::new(),
}
}
}
pub struct group{
rank : i32,
fields : Vec<field>
}
impl Default for group {
fn default() -> Self {
Self {rank: 0,
fields: Vec::new(),
}
}
}
pub fn decode_zone_memoire2(bytes: &[u8]) -> Vec<group>{
let mut current_pos_general = 0;
let mut current_groupe = 0;
let mut num_champ = 0;
let mut longueur_groupe: usize;
let mut current_pos_groupe = 0;
let mut groups : Vec<group> = Vec::new();
while current_pos_general < (bytes.len() - 1) {
num_champ = 0;
current_groupe =
256 * bytes[current_pos_general] as i32 + bytes[current_pos_general + 1 ] as i32;
current_pos_general += 2;
groups.push(group::default());
groups.last_mut().unwrap().rank=current_groupe;
if bytes[current_pos_general] < 128 {
longueur_groupe = bytes[current_pos_general] as usize;
} else {
let nbre_octets_longueur = bytes[current_pos_general] - 128;
longueur_groupe = (0..nbre_octets_longueur).fold(0, |acc, i| {
current_pos_general += 1;
acc + (256_i32.pow(i as u32) * bytes[current_pos_general] as i32) as usize
});
}
current_pos_general += 1;
println!("------- 3--------");
current_pos_groupe = 0;
while current_pos_groupe < longueur_groupe {
num_champ += 1;
let longueur_champs: usize;
let nbre_octets_longueur: usize;
if bytes[current_pos_general] < 128 {
longueur_champs = bytes[current_pos_general] as usize;
nbre_octets_longueur = 1;
} else {
nbre_octets_longueur = bytes[current_pos_general] as usize - 128;
longueur_champs = (0..nbre_octets_longueur).fold(0, |acc, i| {
current_pos_general += 1;
current_pos_groupe += 1;
acc + (256_i32.pow(i as u32) * bytes[current_pos_general] as i32) as usize
});
}
groups.last_mut().unwrap().fields.push(field::default());
groups.last_mut().unwrap().fields.last_mut().unwrap().rank=num_champ;
if longueur_champs > 0 {
let mut bytes_champ = vec![0; longueur_champs];
bytes_champ.copy_from_slice(
&bytes[current_pos_general + nbre_octets_longueur
..current_pos_general + nbre_octets_longueur + longueur_champs],
);
//groups.last_mut().unwrap().fields.last_mut().unwrap().value= String::from_utf8_lossy(&bytes_champ).to_string();
groups.last_mut().unwrap().fields.last_mut().unwrap().value= bytes_champ;
}
current_pos_general += longueur_champs + nbre_octets_longueur;
current_pos_groupe += longueur_champs + nbre_octets_longueur;
}
}
groups
}
fn ssv_lire_carte_ps2(code_pin :&str, lecteur :&str) -> CartePS{
let resource_ps = CString::new(lecteur).expect("CString::new failed");
let resource_reader = CString::new("").expect("CString::new failed");
let card_number = CString::new(code_pin).expect("CString::new failed");
let mut buffer: *mut c_void = ptr::null_mut();
let mut size: size_t = 0;
let mut hex_values: &[u8] = &[];
unsafe {
let result = SSV_LireCartePS(
resource_ps.as_ptr(),
resource_reader.as_ptr(),
card_number.as_ptr(),
&mut buffer,
&mut size,
);
println!("SSV_LireCartePS result: {}", result);
if !buffer.is_null() {
hex_values = std::slice::from_raw_parts(buffer as *const u8, size);
libc::free(buffer);
}
}
let groups= decode_zone_memoire2(hex_values);
let mut carte_ps = CartePS {
titulaire: TitulairePS {
type_de_carte_ps: String::new(),
type_d_identification_nationale: String::new(),
numero_d_identification_nationale: String::new(),
cle_du_numero_d_identification_nationale: String::new(),
code_civilite: String::new(),
nom_du_ps: String::new(),
prenom_du_ps: String::new(),
categorie_carte: ' ',
},
situations: Vec::new(),
};
for item_group in groups.iter(){
for item_field in item_group.fields.iter(){
match (item_group.rank,item_field.rank) {
(1, 1) => {carte_ps.titulaire.type_de_carte_ps = String::from_utf8_lossy(&item_field.value).to_string();}
(1, 2) => {carte_ps.titulaire.type_d_identification_nationale = String::from_utf8_lossy(&item_field.value).to_string();}
(1, 3) => {carte_ps.titulaire.numero_d_identification_nationale = String::from_utf8_lossy(&item_field.value).to_string();}
(1, 4) => {carte_ps.titulaire.cle_du_numero_d_identification_nationale = String::from_utf8_lossy(&item_field.value).to_string();}
(1, 5) => {carte_ps.titulaire.code_civilite = String::from_utf8_lossy(&item_field.value).to_string();}
(1, 6) => {carte_ps.titulaire.nom_du_ps = String::from_utf8_lossy(&item_field.value).to_string();}
(1, 7) => {carte_ps.titulaire.prenom_du_ps = String::from_utf8_lossy(&item_field.value).to_string();}
(1, 8) => unsafe {carte_ps.titulaire.categorie_carte = char::from_u32_unchecked(item_field.value[0] as u32)}
(2, 1) => {carte_ps.situations.push(SituationPS::default());
carte_ps.situations.last_mut().unwrap().numero_logique_de_la_situation_de_facturation_du_ps = item_field.value[0];}
(2, 2) => {carte_ps.situations.last_mut().unwrap().mode_d_exercice = String::from_utf8_lossy(&item_field.value).to_string();}
(2, 3) => {carte_ps.situations.last_mut().unwrap().statut_d_exercice = String::from_utf8_lossy(&item_field.value).to_string();}
(2, 4) => {carte_ps.situations.last_mut().unwrap().secteur_d_activite = String::from_utf8_lossy(&item_field.value).to_string();}
(2, 5) => {carte_ps.situations.last_mut().unwrap().type_d_identification_structure = String::from_utf8_lossy(&item_field.value).to_string();}
(2, 6) => {carte_ps.situations.last_mut().unwrap().numero_d_identification_structure = String::from_utf8_lossy(&item_field.value).to_string();}
(2, 7) => {carte_ps.situations.last_mut().unwrap().cle_du_numero_d_identification_structure = String::from_utf8_lossy(&item_field.value).to_string();}
(2, 8) => {carte_ps.situations.last_mut().unwrap().raison_sociale_structure = String::from_utf8_lossy(&item_field.value).to_string();}
(2, 9) => {carte_ps.situations.last_mut().unwrap().numero_d_identification_de_facturation_du_ps = String::from_utf8_lossy(&item_field.value).to_string();}
(2, 10) => {carte_ps.situations.last_mut().unwrap().cle_du_numero_d_identification_de_facturation_du_ps = String::from_utf8_lossy(&item_field.value).to_string();}
(2, 11) => {carte_ps.situations.last_mut().unwrap().numero_d_identification_du_ps_remplaçant = String::from_utf8_lossy(&item_field.value).to_string();}
(2, 12) => {carte_ps.situations.last_mut().unwrap().cle_du_numero_d_identification_du_ps_remplaçant = String::from_utf8_lossy(&item_field.value).to_string();}
(2, 13) => {carte_ps.situations.last_mut().unwrap().code_conventionnel = String::from_utf8_lossy(&item_field.value).to_string();}
(2, 14) => {carte_ps.situations.last_mut().unwrap().code_specialite = String::from_utf8_lossy(&item_field.value).to_string();}
(2, 15) => {carte_ps.situations.last_mut().unwrap().code_zone_tarifaire = String::from_utf8_lossy(&item_field.value).to_string();}
(2, 16) => {carte_ps.situations.last_mut().unwrap().code_zone_ik = String::from_utf8_lossy(&item_field.value).to_string();}
(2, 17) => {carte_ps.situations.last_mut().unwrap().code_agrement_1 = String::from_utf8_lossy(&item_field.value).to_string();}
(2, 18) => {carte_ps.situations.last_mut().unwrap().code_agrement_2 = String::from_utf8_lossy(&item_field.value).to_string();}
(2, 19) => {carte_ps.situations.last_mut().unwrap().code_agrement_3 = String::from_utf8_lossy(&item_field.value).to_string();}
(2, 20) => {carte_ps.situations.last_mut().unwrap().habilitation_à_signer_une_facture = String::from_utf8_lossy(&item_field.value).to_string();}
(2, 21) => {carte_ps.situations.last_mut().unwrap().habilitation_à_signer_un_lot = String::from_utf8_lossy(&item_field.value).to_string();}
_ => (),
}
}
}
carte_ps
}