1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
use std::collections::HashMap;
use std::mem::transmute;
use dbus_serialize::types::{Value,BasicValue,Path,Signature,Struct,Variant,Array,Dictionary};
#[derive(Debug)]
pub enum DemarshalError {
MessageTooShort,
CorruptedMessage,
BadUTF8,
BadSignature,
ElementTooBig,
MismatchedParens,
}
pub fn get_alignment(sig: char) -> usize {
match sig {
'y' => 1,
'b' => 1,
'n' => 2,
'q' => 2,
'i' => 4,
'u' => 4,
'x' => 8,
't' => 8,
's' => 4,
'o' => 4,
'g' => 1,
'a' => 4,
'(' => 8,
'{' => 8,
'v' => 1,
_ => panic!("Bogus type")
}
}
fn demarshal_byte(buf: &mut Vec<u8>, offset: &mut usize) -> Result<Value,DemarshalError> {
if buf.len() < 1 {
return Err(DemarshalError::MessageTooShort);
}
let byte = buf.remove(0);
*offset += 1;
return Ok(Value::BasicValue(BasicValue::Byte(byte)))
}
fn align_to(buf: &mut Vec<u8>, offset: &mut usize, align: usize) -> Result<(),DemarshalError> {
if *offset % align == 0 {
return Ok(());
}
let delta = align - (*offset % align);
if buf.len() < delta {
return Err(DemarshalError::MessageTooShort);
}
for _ in 0..delta {
buf.remove(0);
*offset += 1;
}
Ok(())
}
fn demarshal_bool(buf: &mut Vec<u8>, offset: &mut usize) -> Result<Value,DemarshalError> {
try!(align_to(buf, offset, 4));
if buf.len() < 4 {
return Err(DemarshalError::MessageTooShort);
}
let byte = buf.remove(0);
*offset += 1;
for _ in 0..3 {
*offset += 1;
if buf.remove(0) != 0 {
return Err(DemarshalError::CorruptedMessage);
}
}
match byte {
0 => Ok(Value::BasicValue(BasicValue::Boolean(false))),
1 => Ok(Value::BasicValue(BasicValue::Boolean(true))),
_ => Err(DemarshalError::CorruptedMessage)
}
}
fn demarshal_int(buf: &mut Vec<u8>, offset: &mut usize, len: usize, is_signed: bool) -> Result<Value,DemarshalError> {
try!(align_to(buf, offset, len));
if buf.len() < len {
return Err(DemarshalError::MessageTooShort);
}
let mut intbuf = [0; 8];
for i in 0..len {
intbuf[i] = buf.remove(0);
*offset += 1;
}
if is_signed && (intbuf[len-1] & 128 == 128) {
for i in len..8 {
intbuf[i] = 0xff;
}
}
let val : u64 = unsafe { transmute(intbuf) };
if is_signed {
match len {
2 => Ok(Value::BasicValue(BasicValue::Int16(val as i16))),
4 => Ok(Value::BasicValue(BasicValue::Int32(val as i32))),
8 => Ok(Value::BasicValue(BasicValue::Int64(val as i64))),
_ => panic!("Bogus length {}", len)
}
} else {
match len {
1 => Ok(Value::BasicValue(BasicValue::Byte(val as u8))),
2 => Ok(Value::BasicValue(BasicValue::Uint16(val as u16))),
4 => Ok(Value::BasicValue(BasicValue::Uint32(val as u32))),
8 => Ok(Value::BasicValue(BasicValue::Uint64(val))),
_ => panic!("Bogus length {}", len)
}
}
}
fn demarshal_string(buf: &mut Vec<u8>, offset: &mut usize, count_size: usize, is_path: bool) -> Result<Value,DemarshalError> {
let len = match demarshal_int(buf, offset, count_size, false) {
Ok(Value::BasicValue(BasicValue::Uint32(x))) => x,
Ok(Value::BasicValue(BasicValue::Byte(x))) => x as u32,
_ => return Err(DemarshalError::CorruptedMessage),
};
let mut strbuf = Vec::new();
for _ in 0..len {
strbuf.push(buf.remove(0));
*offset += 1
}
if buf.remove(0) != 0 {
return Err(DemarshalError::CorruptedMessage);
}
*offset += 1;
let val = try!(String::from_utf8(strbuf).or(Err(DemarshalError::BadUTF8)));
if is_path {
Ok(Value::BasicValue(BasicValue::ObjectPath(Path(val))))
} else {
if count_size == 4 {
Ok(Value::BasicValue(BasicValue::String(val)))
} else {
Ok(Value::BasicValue(BasicValue::Signature(Signature(val))))
}
}
}
fn demarshal_array(buf: &mut Vec<u8>, offset: &mut usize, sig: &mut String) -> Result<Value,DemarshalError> {
if sig.len() < 1 {
return Err(DemarshalError::BadSignature);
}
let typ = sig.chars().next().unwrap();
let is_dict = if typ == '{' {
true
} else {
false
};
let array_len = match demarshal_int(buf, offset, 4, false) {
Ok(Value::BasicValue(BasicValue::Uint32(x))) => x,
_ => return Err(DemarshalError::CorruptedMessage),
};
if array_len > 1 << 26 {
return Err(DemarshalError::ElementTooBig);
}
try!(align_to(buf, offset, get_alignment(typ)));
if buf.len() < (array_len as usize) {
return Err(DemarshalError::MessageTooShort);
}
let mut vec = Vec::new();
let start_offset = *offset;
let mut sig_copy = "".to_string();
while *offset < start_offset+(array_len as usize) {
sig_copy = sig.to_string();
vec.push(try!(demarshal(buf, offset, &mut sig_copy)));
}
let mut mysig = sig.clone();
mysig.truncate(sig.len() - sig_copy.len());
mysig.insert(0, 'a');
*sig = sig_copy;
if is_dict {
let mut map : HashMap<BasicValue,Value> = HashMap::new();
for x in vec {
let mut s = match x {
Value::Struct(x) => x,
_ => panic!("Dictionaries should contain structs")
};
let val = s.objects.remove(1);
let key = match &s.objects[0] {
&Value::BasicValue(ref x) => x,
_ => panic!("Dictionaries require BasicValue keys")
};
map.insert(key.clone(), val);
}
return Ok(Value::Dictionary(Dictionary::new_with_sig(map, mysig)));
}
Ok(Value::Array(Array::new_with_sig(vec, mysig)))
}
fn demarshal_struct(buf: &mut Vec<u8>, offset: &mut usize, sig: &mut String) -> Result<Value,DemarshalError> {
if sig.len() < 1 {
return Err(DemarshalError::BadSignature);
}
try!(align_to(buf, offset, 8));
let mut vec = Vec::new();
let mut mysig = sig.to_string();
loop {
let typ = match sig.chars().next() {
Some(x) => x,
None => return Err(DemarshalError::MismatchedParens)
};
if typ == ')' {
sig.remove(0);
break;
}
vec.push(try!(demarshal(buf, offset, sig)));
}
let oldlen = mysig.len();
mysig.truncate(oldlen - sig.len());
mysig.insert(0, '(');
Ok(Value::Struct(Struct{
objects: vec,
signature: Signature(mysig)
}))
}
fn demarshal_variant(buf: &mut Vec<u8>, offset: &mut usize) -> Result<Value,DemarshalError> {
let mut variant_sig = "g".to_string();
let sigval = try!(demarshal(buf, offset, &mut variant_sig));
let sig = match sigval {
Value::BasicValue(BasicValue::Signature(x)) => x,
_ => return Err(DemarshalError::CorruptedMessage)
};
let mut s = sig.0.to_string();
let var = try!(demarshal(buf, offset, &mut s));
Ok(Value::Variant(Variant{
object: Box::new(var),
signature: sig
}))
}
pub fn demarshal(buf: &mut Vec<u8>, offset: &mut usize, sig: &mut String) -> Result<Value,DemarshalError> {
let typ = sig.remove(0);
match typ {
'y' => demarshal_byte(buf, offset),
'b' => demarshal_bool(buf, offset),
'n' => demarshal_int(buf, offset, 2, true),
'q' => demarshal_int(buf, offset, 2, false),
'i' => demarshal_int(buf, offset, 4, true),
'u' => demarshal_int(buf, offset, 4, false),
'x' => demarshal_int(buf, offset, 8, true),
't' => demarshal_int(buf, offset, 8, false),
's' => demarshal_string(buf, offset, 4, false),
'o' => demarshal_string(buf, offset, 4, true),
'g' => demarshal_string(buf, offset, 1, false),
'a' => demarshal_array(buf, offset, sig),
'(' => demarshal_struct(buf, offset, sig),
'{' => demarshal_struct(buf, offset, sig),
'v' => demarshal_variant(buf, offset),
_ => Err(DemarshalError::BadSignature)
}
}
#[cfg(test)]
mod test {
use marshal::Marshal;
use demarshal::demarshal;
use dbus_serialize::types::{Value,BasicValue,Signature};
#[test]
fn test_demarshal_u32() {
let mut buf = Vec::new();
let x = 16 as u32;
let mut sig = x.get_type().to_string();
x.dbus_encode(&mut buf);
let mut offset = 0;
let v = demarshal(&mut buf, &mut offset, &mut sig).unwrap();
assert_eq!(v, Value::BasicValue(BasicValue::Uint32(16)));
assert_eq!(buf.len(), 0);
assert_eq!(sig, "");
}
#[test]
fn test_demarshal_u32_offset() {
let mut buf = Vec::new();
buf.insert(0, 0);
let x = 16 as u32;
let mut sig = x.get_type();
x.dbus_encode(&mut buf);
buf.remove(0);
let mut offset = 1;
let v = demarshal(&mut buf, &mut offset, &mut sig).unwrap();
assert_eq!(v, Value::BasicValue(BasicValue::Uint32(16)));
assert_eq!(buf.len(), 0);
assert_eq!(sig, "");
}
#[test]
fn test_string() {
let mut buf = Vec::new();
let x = "swalter".to_string();
let mut sig = x.get_type();
x.dbus_encode(&mut buf);
let mut offset = 0;
let v = demarshal(&mut buf, &mut offset, &mut sig).unwrap();
assert_eq!(v, Value::BasicValue(BasicValue::String("swalter".to_string())));
assert_eq!(buf.len(), 0);
assert_eq!(sig, "");
}
#[test]
fn test_array() {
let mut buf = Vec::new();
let x = vec![1 as u32, 2 as u32, 3 as u32];
let mut sig = "au".to_string();
x.dbus_encode(&mut buf);
let mut offset = 0;
let v = demarshal(&mut buf, &mut offset, &mut sig).unwrap();
let arr = match v {
Value::Array(x) => x,
_ => panic!("Bad return from demarshal {:?}", v)
};
let golden = vec![
Value::BasicValue(BasicValue::Uint32(1)),
Value::BasicValue(BasicValue::Uint32(2)),
Value::BasicValue(BasicValue::Uint32(3)),
];
assert_eq!(arr.objects, golden);
assert_eq!(buf.len(), 0);
assert_eq!(sig, "");
}
#[test]
fn test_array_bytes() {
let mut buf = Vec::new();
let x = vec![1 as u8, 2 as u8, 3 as u8];
let mut sig = "ay".to_string();
x.dbus_encode(&mut buf);
let mut offset = 0;
let v = demarshal(&mut buf, &mut offset, &mut sig).unwrap();
let arr = match v {
Value::Array(x) => x,
_ => panic!("Bad return from demarshal {:?}", v)
};
let golden = vec![
Value::BasicValue(BasicValue::Byte(1)),
Value::BasicValue(BasicValue::Byte(2)),
Value::BasicValue(BasicValue::Byte(3)),
];
assert_eq!(arr.objects, golden);
assert_eq!(buf.len(), 0);
assert_eq!(sig, "");
}
#[test]
fn test_struct() {
let mut buf = Vec::new();
let x = "swalter".to_string();
let mut sig = "(ss)".to_string();
x.dbus_encode(&mut buf);
x.dbus_encode(&mut buf);
let mut offset = 0;
let v = demarshal(&mut buf, &mut offset, &mut sig).unwrap();
assert_eq!(buf.len(), 0);
assert_eq!(sig, "");
let s = match v {
Value::Struct(x) => x,
_ => panic!("Bad return from demarshal {:?}", v)
};
assert_eq!(s.signature, Signature("(ss)".to_string()));
}
}