Changeset 565

Timestamp:

03/25/07 13:27:28 (2 years ago)

Author:

sacha

Message:

changed the way how to determine first mime part (soap message).
this version supports cases where the first mime part (soap message) has a Content-Id.

Files:

• trunk/src-c/xmldsig-signing-ebXML-user-message/hefeweizen_sign_ebXML_user_message.c (modified) (11 diffs)
• trunk/src-c/xmldsig-validate-signature-ebXML-user-message/hefeweizen_validate_signature_ebXML_user_message.c (modified) (5 diffs)

trunk/src-c/xmldsig-signing-ebXML-user-message/hefeweizen_sign_ebXML_user_message.c

@@ -107 +107 @@
-char* file_path;
-
-1
+0
-
-char* get_temp_filename();
@@ -119 +119 @@
-int replace_soap_header(const char* multipart_mime_file, xmlChar* signed_soap_mem, const char* output_file_name);
-int replace_soap_header_y(const char* multipart_mime_file, const char* temp_output_file_name, const char* output_file_name);
+
+int foreach_callback_soap_soap_found = 0;
+int foreach_callback_payload_soap_passed = 0;
-
-/**
@@ -359 +362 @@
-foreach_callback_soap(GMimeObject *part, gpointer user_data)
-{
-  const char* content_id = NULL;
-  GMimeDataWrapper *content;
-  const char *filename;
@@ -365 +367 @@
-  int fd2;
-
-content_id = g_mime_part_get_content_id((GMimePart *)part);  
-
-/* The first mime part has no content id. That is where the SOAP message is. */
-if (content_id != NULL) 
+if (foreach_callback_soap_soap_found == 0){
+
+}
+else
-    return;
-  }
-
+
-  if ((fd2 = open (soap_file_path, O_CREAT | O_WRONLY | O_TRUNC, 0666)) == -1) {
-    fprintf(stdout, "ERRROR creating output file");
@@ -392 +394 @@
-}
-
-static void 
-foreach_callback_soapx(GMimeObject *part, gpointer user_data)
-{
-  const char* content_id = NULL;
-  GMimeDataWrapper *content;
-  const char *filename;
-  GMimeStream *stream;
-  int fd2;
-
-  content_id = g_mime_part_get_content_id((GMimePart *)part);  
-
-  /* The first mime part has no content id. That is where the SOAP message is. */
-  if (content_id != NULL) {
-    return;
-  }
-  
-  if ((fd2 = open (soap_file_path, O_CREAT | O_WRONLY | O_TRUNC, 0666)) == -1) {
-    fprintf(stdout, "ERRROR creating output file");
-    return;
-  }
-  
-  /* writing the content to the soap file path */
-  stream = g_mime_stream_fs_new (fd2);
-  content = g_mime_part_get_content_object ((GMimePart*)part);
-  g_mime_data_wrapper_write_to_stream (content, stream);
-  g_mime_stream_flush (stream);
-  
-  g_object_unref (content);
-  g_object_unref (stream);
-  
-  close(fd2);
-  
-  soap_message_read_done = 1;
-
-}
-
-
-int replace_soap_header(const char* original_multipart_mime_file, xmlChar* signed_soap_mem, const char* final_output_file_name){
@@ -447 +413 @@
-  GMimePart* soap = (GMimePart*) g_mime_multipart_get_part(multipart, 0);
-  
-
+
+
+
-  g_mime_part_set_content(soap, (char*)signed_soap_mem, strlen(signed_soap_mem));
-  //  g_mime_multipart_set_boundary(multipart, "dddddddddddddddddddddddddd^M");
@@ -454 +422 @@
-  text = g_mime_message_to_string (message);
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-  FILE* output_file = NULL;
@@ -466 +502 @@
-  g_mime_object_unref (GMIME_OBJECT (message));
-
-  xmlFree(signed_soap_mem);
-  return 0;
-  
-}
-
-int replace_soap_header_y(const char* original_multipart_mime_file, const char* signed_soap_file_name, const char* final_output_file_name){
-  GMimeMessage* message;
-  int fd;
-
-  if ((fd = open (multipart_mime_file, O_RDONLY)) == -1) {
-    fprintf (stderr, "Cannot open message `%s': %s to write soap message.\n", multipart_mime_file, strerror (errno));
-    //    return -1;
-  }
-  
-  message = parse_message(fd);
-  close(fd);
-
-  GMimeObject* part = NULL;
-  part = g_mime_message_get_mime_part(message);
-  GMimeMultipart* multipart = (GMimeMultipart*) part;
-
-  GMimePart* soap = (GMimePart*) g_mime_multipart_get_part(multipart, 0);
-  
-  fprintf(stdout, "HHHHHHHHHHHHHHHELO\n");
-  fprintf(stdout, "HHHHHHHHHHHHHHHELO\n");
-  fprintf(stdout, "HHHHHHHHHHHHHHHELO\n");
-  
-  FILE * pFile;
-  long lSize;
-  char * buffer;
-  size_t result;
-
-  pFile = fopen ( signed_soap_file_name , "rb" );
-  if (pFile==NULL) {fputs ("File error",stderr); return (-1);}
-
-  // obtain file size:
-  fseek (pFile , 0 , SEEK_END);
-  lSize = ftell (pFile);
-  rewind (pFile);
-
-  // allocate memory to contain the whole file:
-  buffer = (char*) malloc (sizeof(char)*lSize);
-  if (buffer == NULL) {fputs ("Memory error",stderr); return (-2);}
-
-  // copy the file into the buffer:
-  result = fread (buffer,1,lSize,pFile);
-  if (result != lSize) {fputs ("Reading error",stderr); return (-3);}
-
-  /* the whole file is now loaded in the memory buffer. */
-  
-
-  fprintf(stdout, "HHHHHHHHHHHHHHHELO\n");
-  fprintf(stdout, "Before strlen: replace soap header_y");
-  g_mime_part_set_content(soap, buffer, strlen(buffer));
-
-  char* text;
-  text = g_mime_message_to_string (message);
-
-  fprintf(stdout, "Writing this mess: %s", text);
-
-  FILE* output_file = NULL;
-  //  char* file_name = "/tmp/final_output_soap_file";
-  if ((output_file = fopen(final_output_file_name, "w")) == NULL)
-    fprintf(stderr, "Cannot open %s to write soap message.\n", final_output_file_name);
-  fprintf(output_file, "%s", text);
-  fclose(output_file);
-
-  g_free (text);
-  g_mime_object_unref (GMIME_OBJECT (message));
-
-  // terminate
-  fclose (pFile);
@@ -554 +520 @@
-  int fd2;
-
+  if (foreach_callback_payload_soap_passed == 0){
+    foreach_callback_payload_soap_passed = 1;
+    return;
+  }
+
-  if (debug == 1){
-    fprintf(stdout, "Getting content id of given mime part");
@@ -559 +530 @@
-  content_id = g_mime_part_get_content_id((GMimePart *)part);
-
-  if (content_id == NULL) {
-    return;
-  }
-  
-  if (debug == 1)
-    fprintf(stdout, "The content id is '%s' .\n", content_id );
@@ -630 +597 @@
-    fprintf(stdout, "new filename %s\n", payload_message_filename);
-
-
-
+
+
+
+
+
-
-  g_mime_message_foreach_part (message, foreach_callback_payload, &count);

trunk/src-c/xmldsig-validate-signature-ebXML-user-message/hefeweizen_validate_signature_ebXML_user_message.c

@@ -77 +77 @@
-static void foreach_callback_soap(GMimeObject *part, gpointer user_data);
-
+int foreach_callback_soap_soap_found = 0;
+int foreach_callback_payload_soap_passed = 0;
+
-xmlSecKeysMngrPtr load_trusted_certs(char** files, int files_size);
-int verify_file(xmlSecKeysMngrPtr mngr, const char* xml_file, const char* temp_dir);
@@ -534 +537 @@
-  int fd2;
-
+  if (foreach_callback_payload_soap_passed == 0){
+    foreach_callback_payload_soap_passed = 1;
+    return;
+  }
+
+  if (debug == 1){
+    fprintf(stdout, "Getting content id of given mime part");
+  }
-  content_id = g_mime_part_get_content_id((GMimePart *)part);
-
-  if (content_id == NULL) {
-    return;
-  }
-
-  if (debug == 1){
@@ -582 +589 @@
-foreach_callback_soap(GMimeObject *part, gpointer user_data)
-{
-  const char* content_id = NULL;
-  GMimeDataWrapper *content;
-  const char *filename;
@@ -588 +594 @@
-  int fd2;
-
-
-
-
-
+
+
+
+
+
-    return;
-  }
-
+
-  if ((fd2 = open (soap_file_path, O_CREAT | O_WRONLY | O_TRUNC, 0666)) == -1) {
-    fprintf(stdout, "ERRROR creating output file");
@@ -643 +650 @@
-    fprintf(stdout, "new filename %s\n", payload_message_filename);
-
+  /* resetting the counter to find payload */
+  foreach_callback_payload_soap_passed = 0;
-
-  g_mime_message_foreach_part (message, foreach_callback_payload, &count);