Commit b6a5322

committed

metadata_tostring_fix handle and return only strings

1 parent ca0696c commit b6a5322Copy full SHA for b6a5322

File tree

+12

-5

lines changed

+12

-5

lines changed

Lines changed: 0 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -65,14 +65,12 @@`
`65`	`65`	`def metadata_tostring_fix(desc, nspair, xmlstring=""):`
`66`	`66`	`if not xmlstring:`
`67`	`67`	`xmlstring = desc.to_string(nspair)`
`68`		`-`
`69`	`68`	`try:`
`70`	`69`	`if "\"xs:string\"" in xmlstring and XMLNSXS not in xmlstring:`
`71`	`70`	`xmlstring = xmlstring.replace(MDNS, MDNS + XMLNSXS)`
`72`	`71`	`except TypeError:`
`73`	`72`	`if b"\"xs:string\"" in xmlstring and bXMLNSXS not in xmlstring:`
`74`	`73`	`xmlstring = xmlstring.replace(bMDNS, bMDNS + bXMLNSXS)`
`75`		`-`
`76`	`74`	`return xmlstring`
`77`	`75`
`78`	`76`

Lines changed: 12 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,12 @@`
`34`	`34`	`help="xmlsec binaries to be used for the signing")`
`35`	`35`	`parser.add_argument('-w', dest='wellknown',`
`36`	`36`	`help="Use wellknown namespace prefixes")`
	`37`	`+parser.add_argument('-S', dest='signalg',`
	`38`	`+ default='http://www.w3.org/2000/09/xmldsig#rsa-sha1',`
	`39`	`+ help="Algorithm to sign the metadata")`
	`40`	`+parser.add_argument('-D', dest='digestalg',`
	`41`	`+ default='http://www.w3.org/2000/09/xmldsig#sha1',`
	`42`	`+ help="Algorithm to compute the digest of the metadata")`
`37`	`43`	`parser.add_argument(dest="config", nargs="+")`
`38`	`44`	`args = parser.parse_args()`
`39`	`45`
`@@ -70,16 +76,19 @@`
`70`	`76`	`args.sign, secc)`
`71`	`77`	`valid_instance(desc)`
`72`	`78`	`xmldoc = metadata_tostring_fix(desc, nspair, xmldoc)`
`73`		`- print(xmldoc.decode("utf-8"))`
	`79`	`+ print(xmldoc)`
`74`	`80`	`else:`
`75`	`81`	`for eid in eds:`
`76`	`82`	`if args.sign:`
`77`	`83`	`assert conf.key_file`
`78`	`84`	`assert conf.cert_file`
`79`		`- eid, xmldoc = sign_entity_descriptor(eid, args.id, secc)`
	`85`	`+ sign_alg = args.signalg`
	`86`	`+ digest_alg = args.digestalg`
	`87`	`+ eid, xmldoc = sign_entity_descriptor(eid, args.id, secc, sign_alg,`
	`88`	`+ digest_alg)`
`80`	`89`	`else:`
`81`	`90`	`xmldoc = None`
`82`	`91`
`83`	`92`	`valid_instance(eid)`
`84`	`93`	`xmldoc = metadata_tostring_fix(eid, nspair, xmldoc)`
`85`		`- print(xmldoc.decode("utf-8"))`
	`94`	`+ print(xmldoc)`

Comments

(0)