[shibboleth-sp2] 14/25: https://issues.shibboleth.net/jira/browse/SSPCPP-175
Ferenc Wágner
wferi-guest at moszumanska.debian.org
Tue Jan 26 21:30:03 UTC 2016
This is an automated email from the git hooks/post-receive script.
wferi-guest pushed a commit to annotated tag 1.3.2
in repository shibboleth-sp2.
commit 51f6726822c28271430aa00739ba0c527c59a724
Author: Scott Cantor <cantor.2 at osu.edu>
Date: Tue Jan 6 19:56:58 2009 +0000
https://issues.shibboleth.net/jira/browse/SSPCPP-175
---
nsapi_shib/nsapi_shib.cpp | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/nsapi_shib/nsapi_shib.cpp b/nsapi_shib/nsapi_shib.cpp
index 1c9394d..d9f4900 100644
--- a/nsapi_shib/nsapi_shib.cpp
+++ b/nsapi_shib/nsapi_shib.cpp
@@ -1,6 +1,6 @@
/*
* Copyright 2001-2005 Internet2
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
@@ -186,7 +186,7 @@ public:
url=uri;
if (qstr)
url=url + '?' + qstr;
-
+
#ifdef vs_is_default_vs
// This is 6.0 or later, so we can distinguish requests to name-based vhosts.
if (!vs_is_default_vs(request_get_vs(m_rq)))
@@ -200,12 +200,12 @@ public:
char* content_type = "";
request_header("content-type", &content_type, sn, rq);
-
+
const char* remote_ip = pblock_findval("ip", sn->client);
const char* method = pblock_findval("method", rq->reqpb);
init(scheme, host, port, url.c_str(), content_type, remote_ip, method);
-
+
// See if this is the first time we've run.
method = pblock_findval("auth-type", rq->vars);
if (method && !strcmp(method, "shibboleth"))
@@ -231,7 +231,7 @@ public:
string cookie = name + '=' + value;
pblock_nvinsert("Set-Cookie", cookie.c_str(), m_rq->srvhdrs);
}
- virtual string getArgs(void) {
+ virtual string getArgs(void) {
const char *q = pblock_findval("query", m_rq->reqpb);
return string(q ? q : "");
}
@@ -246,7 +246,7 @@ public:
string cgistr;
while (cl && ch != IO_EOF) {
ch=netbuf_getc(m_sn->inbuf);
-
+
// Check for error.
if(ch==IO_ERROR)
break;
@@ -381,14 +381,14 @@ extern "C" NSAPI_PUBLIC int nsapi_shib(pblock* pb, Session* sn, Request* rq)
ostringstream threadid;
threadid << "[" << getpid() << "] nsapi_shib" << '\0';
saml::NDC ndc(threadid.str().c_str());
-
+
try {
ShibTargetNSAPI stn(pb, sn, rq);
-
+
// Check user authentication
pair<bool,void*> res = stn.doCheckAuthN();
if (res.first) return (int)res.second;
-
+
// user authN was okay -- export the assertions now
param_free(pblock_remove("auth-user",rq->vars));
// This seems to be required in order to eventually set
@@ -396,11 +396,11 @@ extern "C" NSAPI_PUBLIC int nsapi_shib(pblock* pb, Session* sn, Request* rq)
pblock_nvinsert("auth-type","shibboleth",rq->vars);
res = stn.doExportAssertions();
if (res.first) return (int)res.second;
-
+
// Check the Authorization
res = stn.doCheckAuthZ();
if (res.first) return (int)res.second;
-
+
// this user is ok.
return REQ_PROCEED;
}
@@ -423,13 +423,13 @@ extern "C" NSAPI_PUBLIC int shib_handler(pblock* pb, Session* sn, Request* rq)
ostringstream threadid;
threadid << "[" << getpid() << "] shib_handler" << '\0';
saml::NDC ndc(threadid.str().c_str());
-
+
try {
ShibTargetNSAPI stn(pb, sn, rq);
-
+
pair<bool,void*> res = stn.doHandler();
if (res.first) return (int)res.second;
-
+
return WriteClientError(sn, rq, FUNC, "Shibboleth handler did not do anything.");
}
catch (exception& e) {
@@ -452,7 +452,7 @@ public:
void lock() { m_mapper->lock(); }
void unlock() { m_stKey->setData(NULL); m_propsKey->setData(NULL); m_mapper->unlock(); }
Settings getSettings(ShibTarget* st) const;
-
+
pair<bool,bool> getBool(const char* name, const char* ns=NULL) const;
pair<bool,const char*> getString(const char* name, const char* ns=NULL) const;
pair<bool,const XMLCh*> getXMLString(const char* name, const char* ns=NULL) const;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-shibboleth/shibboleth-sp2.git
More information about the Pkg-shibboleth-devel
mailing list