From bce7808fecc65d56b695be03f6b39fed51589562 Mon Sep 17 00:00:00 2001 From: deva Date: Mon, 9 Jun 2008 13:48:24 +0000 Subject: Added xml encoding of the lua programs to make sure they are not interrupting the xml. Missing files. --- server/src/xml_encode_decode.cc | 95 +++++++++++++++++++++++++++++++++++++++++ server/src/xml_encode_decode.h | 35 +++++++++++++++ 2 files changed, 130 insertions(+) create mode 100644 server/src/xml_encode_decode.cc create mode 100644 server/src/xml_encode_decode.h diff --git a/server/src/xml_encode_decode.cc b/server/src/xml_encode_decode.cc new file mode 100644 index 0000000..c5e4917 --- /dev/null +++ b/server/src/xml_encode_decode.cc @@ -0,0 +1,95 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/*************************************************************************** + * xml_encode_decode.cc + * + * Mon Jun 9 10:19:33 CEST 2008 + * Copyright 2008 Bent Bisballe Nyeng + * deva@aasimon.org + ****************************************************************************/ + +/* + * This file is part of Pracro. + * + * Pracro 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. + * + * Pracro 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 Pracro; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. + */ +#include "xml_encode_decode.h" + +char xml_map[][2][16] = + { + { "&", "&" }, // & must be first + { "\'", "'" }, + { "\"", "&qout;" }, + { ">", ">" }, + { "<", "<" }, + { "", "" } // End marker + }; + +#define MAX_MAPS 5 + +std::string xml_encode(std::string str) +{ + size_t pos; + + for( int map = 0; map < MAX_MAPS; map++ ) { + pos = 0; + while( ( pos = str.find(xml_map[map][0], pos) ) != std::string::npos) { + str.replace(pos, strlen(xml_map[map][0]), xml_map[map][1]); + pos += strlen(xml_map[map][0]); + } + } + + return str; +} + +std::string xml_decode(std::string str) +{ + size_t pos; + + // Traverse backwards, to handle '&' last. + for( int map = MAX_MAPS - 1; map > -1; map-- ) { + pos = 0; + while( ( pos = str.find(xml_map[map][1], pos) ) != std::string::npos) { + str.replace(pos, strlen(xml_map[map][1]), xml_map[map][0]); + pos += strlen(xml_map[map][1]); + } + } + + return str; +} + +#ifdef TEST_XML_ENCODE_DECODE + +int main() +{ + std::string in = "&AC\"D\'E"; + printf("Input: \"%s\"\n", in.c_str()); + + std::string enc = xml_encode(in); + printf("Encoded: \"%s\"\n", enc.c_str()); + + std::string denc = xml_encode(enc); + printf("DoubleEncoded: \"%s\"\n", denc.c_str()); + + std::string dec = xml_decode(denc); + printf("Decoded: \"%s\"\n", dec.c_str()); + + std::string ddec = xml_decode(dec); + printf("DoubleDecoded: \"%s\"\n", ddec.c_str()); + + if( in == ddec && enc == dec) return 0; + return 1; +} + +#endif/*TEST_XML_ENCODE_DECODE*/ diff --git a/server/src/xml_encode_decode.h b/server/src/xml_encode_decode.h new file mode 100644 index 0000000..39b1407 --- /dev/null +++ b/server/src/xml_encode_decode.h @@ -0,0 +1,35 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/*************************************************************************** + * xml_encode_decode.h + * + * Mon Jun 9 10:19:33 CEST 2008 + * Copyright 2008 Bent Bisballe Nyeng + * deva@aasimon.org + ****************************************************************************/ + +/* + * This file is part of Pracro. + * + * Pracro 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. + * + * Pracro 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 Pracro; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. + */ +#ifndef __PRACRO_XML_ENCODE_DECODE_H__ +#define __PRACRO_XML_ENCODE_DECODE_H__ + +#include + +std::string xml_encode(std::string str); +std::string xml_decode(std::string str); + +#endif/*__PRACRO_XML_ENCODE_DECODE_H__*/ -- cgit v1.2.3