forbid access to group folders if request is not from the intranet

git-svn-id: http://svn.opengroupware.org/SOGo/trunk@731 d1b88da0-ebda-0310-925b-ed51d893ca5b

diff --git a/SOGo/SoObjects/SOGo/ChangeLog b/SOGo/SoObjects/SOGo/ChangeLog
index e13e503e4ea1e79b3ca5404c89593d626673fb5f..f43cfb155605f2f0e3567034c3129d7685dffabf 100644 (file)
--- a/SOGo/SoObjects/SOGo/ChangeLog
+++ b/SOGo/SoObjects/SOGo/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-12  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * SOGoUserFolder.m: forbid access (403) to SOGoGroupFolders if access
+         is not from the Intranet (v0.9.49)
+
 2005-07-12  Helge Hess  <helge.hess@opengroupware.org>
 
        * AgenorUserDefaults.m: added automagic profile row creation (v0.9.48)

diff --git a/SOGo/SoObjects/SOGo/SOGoUserFolder.m b/SOGo/SoObjects/SOGo/SOGoUserFolder.m
index 4156e6b850027d3eee4d320cef624050ad7593ef..66057cc45b8e6f8c3b1bec8e725c5312adface92 100644 (file)
--- a/SOGo/SoObjects/SOGo/SOGoUserFolder.m
+++ b/SOGo/SoObjects/SOGo/SOGoUserFolder.m
@@ -21,6 +21,7 @@
 // $Id$
 
 #include "SOGoUserFolder.h"
+#include "WOContext+Agenor.h"
 #include "common.h"
 
 @implementation SOGoUserFolder
@@ -182,8 +183,13 @@
   if ([_key isEqualToString:@"Contacts"])
     return [self privateContacts:_key inContext:_ctx];
   
-  if ([_key isEqualToString:@"Groups"])
+  if ([_key isEqualToString:@"Groups"]) {
+    /* Agenor requirement, return 403 to stop acquisition */
+    if (![_ctx isAccessFromIntranet]) {
+      return [NSException exceptionWithHTTPStatus:403 /* Forbidden */];
+    }
     return [self groupsFolder:_key inContext:_ctx];
+  }
 
   if ([_key isEqualToString:@"Mail"])
     return [self mailAccountsFolder:_key inContext:_ctx];

diff --git a/SOGo/SoObjects/SOGo/Version b/SOGo/SoObjects/SOGo/Version
index e2cd11d244331d891486b829a1002f1c48ebdddb..dd43a42afb40afd532d60c38c152a607846933c2 100644 (file)
--- a/SOGo/SoObjects/SOGo/Version
+++ b/SOGo/SoObjects/SOGo/Version
@@ -1,6 +1,6 @@
 # version file
 
-SUBMINOR_VERSION:=48
+SUBMINOR_VERSION:=49
 
 # v0.9.34 requires libGDLContentStore v4.5.26
 # v0.9.26 requires libOGoContentStore v0.9.13