#3120: prevent webcalendar to reveal endpoint nature

SoObjects/Appointments/SOGoWebAppointmentFolder.m

@@ -182,7 +182,10 @@ size_t curl_body_function(void *ptr, size_t size, size_t nmemb, void *buffer)
                                  forKey: @"imported"];
                     }
                   else
-                    [result setObject: @"invalid-calendar-content" forKey: @"error"];
+                    {
+                      [self errorWithFormat: @"Invalid calendar content from web calendar %@", location];
+                      [result setObject: @"invalid-calendar-content" forKey: @"error"];
+                    }
                 }
               else if (status == 401)
               {

UI/Scheduler/UIxCalFolderActions.m

@@ -155,19 +155,21 @@
   httpCode = 200;
   results = [[self clientObject] loadWebCalendar];
 
-  
-  if ([results objectForKey: @"status"])
-  {
-    if ([results objectForKey: @"error"])
+  // Don't reveal how the remote host answered (connection error, HTTP error
+  // or non-calendar content): all failures except a required authentication
+  // return the same response. Details are kept in the server log.
+  error = [results objectForKey: @"error"];
+  if (error)
     {
-      error = [results objectForKey: @"error"];
       if ([error isEqualToString: @"need-auth"])
         httpCode = 401;
-      if ([error isEqualToString: @"invalid-calendar-content"] || [error isEqualToString: @"http-error"])
-        httpCode = 500;
+      else
+        {
+          httpCode = 500;
+          [results setObject: @"bad-url" forKey: @"error"];
+        }
     }
-    [results removeObjectForKey:@"status"];
-  }
+  [results removeObjectForKey: @"status"];
 
   return [self responseWithStatus: httpCode andJSONRepresentation: results];
 }