flywithu/android-library
1
0
Fork 0
mirror of https://github.com/owncloud/android-library.git synced 2025-06-07 16:06:08 +00:00
Code Issues Releases Wiki Activity

Merge pull request #19 from owncloud/regular_authentication_in_saml_server

Browse Source 
Prevent than app without SAML support simulates a fake authentication in a SAML server
This commit is contained in:
David A. Velasco 2014-03-24 10:14:15 +01:00
commit 25c53f3bf9
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java
View File

@ -59,8 +59,8 @@ import android.util.Log;
*/ */
public class RemoteOperationResult implements Serializable { public class RemoteOperationResult implements Serializable {
/** Generated - should be refreshed every time the class changes!! */ /** Generated - should be refreshed every time the class changes!! */;
private static final long serialVersionUID = -8257349554488668693L; private static final long serialVersionUID = -9003837206000993465L;
private static final String TAG = "RemoteOperationResult"; private static final String TAG = "RemoteOperationResult";
@ -105,6 +105,7 @@ public class RemoteOperationResult implements Serializable {
private Exception mException = null; private Exception mException = null;
private ResultCode mCode = ResultCode.UNKNOWN_ERROR; private ResultCode mCode = ResultCode.UNKNOWN_ERROR;
private String mRedirectedLocation; private String mRedirectedLocation;
private String mAuthenticate;
private ArrayList<Object> mData; private ArrayList<Object> mData;
@ -155,6 +156,10 @@ public class RemoteOperationResult implements Serializable {
mRedirectedLocation = current.getValue(); mRedirectedLocation = current.getValue();
break; break;
} }
if ("WWW-Authenticate".equals(current.getName())) {
mAuthenticate = current.getValue();
break;
}
} }
} }
} }
@ -360,4 +365,8 @@ public class RemoteOperationResult implements Serializable {
mRedirectedLocation.toLowerCase().contains("wayf"))); mRedirectedLocation.toLowerCase().contains("wayf")));
} }
public String getAuthenticateHeader() {
return mAuthenticate;
}
} }

4
src/com/owncloud/android/lib/resources/shares/ShareXMLParser.java
View File

@ -32,7 +32,7 @@ import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException; import org.xmlpull.v1.XmlPullParserException;
import org.xmlpull.v1.XmlPullParserFactory; import org.xmlpull.v1.XmlPullParserFactory;
import android.util.Log; //import android.util.Log;
import android.util.Xml; import android.util.Xml;
import com.owncloud.android.lib.common.network.WebdavUtils; import com.owncloud.android.lib.common.network.WebdavUtils;
@ -46,7 +46,7 @@ import com.owncloud.android.lib.resources.files.FileUtils;
public class ShareXMLParser { public class ShareXMLParser {
private static final String TAG = ShareXMLParser.class.getSimpleName(); //private static final String TAG = ShareXMLParser.class.getSimpleName();
// No namespaces // No namespaces
private static final String ns = null; private static final String ns = null;