projects
/
shibboleth
/
cpp-sp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
cd049ff
)
Switch status code for access denial.
author
Scott Cantor
<cantor.2@osu.edu>
Thu, 25 Oct 2007 22:49:40 +0000
(22:49 +0000)
committer
Scott Cantor
<cantor.2@osu.edu>
Thu, 25 Oct 2007 22:49:40 +0000
(22:49 +0000)
fastcgi/shibauthorizer.cpp
patch
|
blob
|
history
fastcgi/shibresponder.cpp
patch
|
blob
|
history
isapi_shib/isapi_shib.cpp
patch
|
blob
|
history
shibsp/handler/impl/AssertionLookup.cpp
patch
|
blob
|
history
shibsp/handler/impl/MetadataGenerator.cpp
patch
|
blob
|
history
shibsp/handler/impl/StatusHandler.cpp
patch
|
blob
|
history
diff --git
a/fastcgi/shibauthorizer.cpp
b/fastcgi/shibauthorizer.cpp
index
0d19418
..
284793a
100644
(file)
--- a/
fastcgi/shibauthorizer.cpp
+++ b/
fastcgi/shibauthorizer.cpp
@@
-179,8
+179,9
@@
public:
// so custom Shib errors will get turned into a generic page.
\r
const char* codestr="Status: 500 Server Error";
\r
switch (status) {
\r
// so custom Shib errors will get turned into a generic page.
\r
const char* codestr="Status: 500 Server Error";
\r
switch (status) {
\r
- case XMLTOOLING_HTTP_STATUS_FORBIDDEN: codestr="Status: 403 Forbidden"; break;
\r
- case XMLTOOLING_HTTP_STATUS_NOTFOUND: codestr="Status: 404 Not Found"; break;
\r
+ case XMLTOOLING_HTTP_STATUS_UNAUTHORIZED: codestr="Status: 401 Authorization Required"; break;
\r
+ case XMLTOOLING_HTTP_STATUS_FORBIDDEN: codestr="Status: 403 Forbidden"; break;
\r
+ case XMLTOOLING_HTTP_STATUS_NOTFOUND: codestr="Status: 404 Not Found"; break;
\r
}
\r
cout << codestr << "\r\n" << hdr << "\r\n";
\r
char buf[1024];
\r
}
\r
cout << codestr << "\r\n" << hdr << "\r\n";
\r
char buf[1024];
\r
diff --git
a/fastcgi/shibresponder.cpp
b/fastcgi/shibresponder.cpp
index
d4ca17f
..
ce42928
100644
(file)
--- a/
fastcgi/shibresponder.cpp
+++ b/
fastcgi/shibresponder.cpp
@@
-165,9
+165,10
@@
public:
\r
const char* codestr="Status: 200 OK";
\r
switch (status) {
\r
\r
const char* codestr="Status: 200 OK";
\r
switch (status) {
\r
- case XMLTOOLING_HTTP_STATUS_ERROR: codestr="Status: 500 Server Error"; break;
\r
- case XMLTOOLING_HTTP_STATUS_FORBIDDEN:codestr="Status: 403 Forbidden"; break;
\r
- case XMLTOOLING_HTTP_STATUS_NOTFOUND: codestr="Status: 404 Not Found"; break;
\r
+ case XMLTOOLING_HTTP_STATUS_ERROR: codestr="Status: 500 Server Error"; break;
\r
+ case XMLTOOLING_HTTP_STATUS_UNAUTHORIZED: codestr="Status: 401 Authorization Required"; break;
\r
+ case XMLTOOLING_HTTP_STATUS_FORBIDDEN: codestr="Status: 403 Forbidden"; break;
\r
+ case XMLTOOLING_HTTP_STATUS_NOTFOUND: codestr="Status: 404 Not Found"; break;
\r
}
\r
cout << codestr << "\r\n" << hdr << "\r\n";
\r
char buf[1024];
\r
}
\r
cout << codestr << "\r\n" << hdr << "\r\n";
\r
char buf[1024];
\r
diff --git
a/isapi_shib/isapi_shib.cpp
b/isapi_shib/isapi_shib.cpp
index
e04bdcd
..
ae58d5d
100644
(file)
--- a/
isapi_shib/isapi_shib.cpp
+++ b/
isapi_shib/isapi_shib.cpp
@@
-484,9
+484,10
@@
public:
hdr += "\r\n";
const char* codestr="200 OK";
switch (status) {
hdr += "\r\n";
const char* codestr="200 OK";
switch (status) {
- case XMLTOOLING_HTTP_STATUS_FORBIDDEN:codestr="403 Forbidden"; break;
- case XMLTOOLING_HTTP_STATUS_NOTFOUND: codestr="404 Not Found"; break;
- case XMLTOOLING_HTTP_STATUS_ERROR: codestr="500 Server Error"; break;
+ case XMLTOOLING_HTTP_STATUS_UNAUTHORIZED: codestr="401 Authorization Required"; break;
+ case XMLTOOLING_HTTP_STATUS_FORBIDDEN: codestr="403 Forbidden"; break;
+ case XMLTOOLING_HTTP_STATUS_NOTFOUND: codestr="404 Not Found"; break;
+ case XMLTOOLING_HTTP_STATUS_ERROR: codestr="500 Server Error"; break;
}
m_pfc->ServerSupportFunction(m_pfc, SF_REQ_SEND_RESPONSE_HEADER, (void*)codestr, (DWORD)hdr.c_str(), 0);
char buf[1024];
}
m_pfc->ServerSupportFunction(m_pfc, SF_REQ_SEND_RESPONSE_HEADER, (void*)codestr, (DWORD)hdr.c_str(), 0);
char buf[1024];
@@
-815,9
+816,10
@@
public:
hdr += "\r\n";
const char* codestr="200 OK";
switch (status) {
hdr += "\r\n";
const char* codestr="200 OK";
switch (status) {
- case XMLTOOLING_HTTP_STATUS_FORBIDDEN:codestr="403 Forbidden"; break;
- case XMLTOOLING_HTTP_STATUS_NOTFOUND: codestr="404 Not Found"; break;
- case XMLTOOLING_HTTP_STATUS_ERROR: codestr="500 Server Error"; break;
+ case XMLTOOLING_HTTP_STATUS_UNAUTHORIZED: codestr="401 Authorization Required"; break;
+ case XMLTOOLING_HTTP_STATUS_FORBIDDEN: codestr="403 Forbidden"; break;
+ case XMLTOOLING_HTTP_STATUS_NOTFOUND: codestr="404 Not Found"; break;
+ case XMLTOOLING_HTTP_STATUS_ERROR: codestr="500 Server Error"; break;
}
m_lpECB->ServerSupportFunction(m_lpECB->ConnID, HSE_REQ_SEND_RESPONSE_HEADER, (void*)codestr, 0, (LPDWORD)hdr.c_str());
char buf[1024];
}
m_lpECB->ServerSupportFunction(m_lpECB->ConnID, HSE_REQ_SEND_RESPONSE_HEADER, (void*)codestr, 0, (LPDWORD)hdr.c_str());
char buf[1024];
diff --git
a/shibsp/handler/impl/AssertionLookup.cpp
b/shibsp/handler/impl/AssertionLookup.cpp
index
4854694
..
24915a7
100644
(file)
--- a/
shibsp/handler/impl/AssertionLookup.cpp
+++ b/
shibsp/handler/impl/AssertionLookup.cpp
@@
-112,7
+112,7
@@
pair<bool,long> AssertionLookup::run(SPRequest& request, bool isHandler) const
if (m_acl.count(request.getRemoteAddr()) == 0) {
m_log.error("request for assertion lookup blocked from invalid address (%s)", request.getRemoteAddr().c_str());
istringstream msg("Assertion Lookup Blocked");
if (m_acl.count(request.getRemoteAddr()) == 0) {
m_log.error("request for assertion lookup blocked from invalid address (%s)", request.getRemoteAddr().c_str());
istringstream msg("Assertion Lookup Blocked");
- return make_pair(true,request.sendResponse(msg, HTTPResponse::XMLTOOLING_HTTP_STATUS_
FORBIDDEN
));
+ return make_pair(true,request.sendResponse(msg, HTTPResponse::XMLTOOLING_HTTP_STATUS_
UNAUTHORIZED
));
}
}
}
}
diff --git
a/shibsp/handler/impl/MetadataGenerator.cpp
b/shibsp/handler/impl/MetadataGenerator.cpp
index
21717c5
..
d694926
100644
(file)
--- a/
shibsp/handler/impl/MetadataGenerator.cpp
+++ b/
shibsp/handler/impl/MetadataGenerator.cpp
@@
-127,7
+127,7
@@
pair<bool,long> MetadataGenerator::run(SPRequest& request, bool isHandler) const
if (!m_acl.empty() && m_acl.count(request.getRemoteAddr()) == 0) {
m_log.error("request for metadata blocked from invalid address (%s)", request.getRemoteAddr().c_str());
istringstream msg("Metadata Request Blocked");
if (!m_acl.empty() && m_acl.count(request.getRemoteAddr()) == 0) {
m_log.error("request for metadata blocked from invalid address (%s)", request.getRemoteAddr().c_str());
istringstream msg("Metadata Request Blocked");
- return make_pair(true,request.sendResponse(msg, HTTPResponse::XMLTOOLING_HTTP_STATUS_
FORBIDDEN
));
+ return make_pair(true,request.sendResponse(msg, HTTPResponse::XMLTOOLING_HTTP_STATUS_
UNAUTHORIZED
));
}
}
}
}
diff --git
a/shibsp/handler/impl/StatusHandler.cpp
b/shibsp/handler/impl/StatusHandler.cpp
index
cffb604
..
0b8215a
100644
(file)
--- a/
shibsp/handler/impl/StatusHandler.cpp
+++ b/
shibsp/handler/impl/StatusHandler.cpp
@@
-244,7
+244,7
@@
pair<bool,long> StatusHandler::run(SPRequest& request, bool isHandler) const
if (!m_acl.empty() && m_acl.count(request.getRemoteAddr()) == 0) {
m_log.error("status handler request blocked from invalid address (%s)", request.getRemoteAddr().c_str());
istringstream msg("Status Handler Blocked");
if (!m_acl.empty() && m_acl.count(request.getRemoteAddr()) == 0) {
m_log.error("status handler request blocked from invalid address (%s)", request.getRemoteAddr().c_str());
istringstream msg("Status Handler Blocked");
- return make_pair(true,request.sendResponse(msg, HTTPResponse::XMLTOOLING_HTTP_STATUS_
FORBIDDEN
));
+ return make_pair(true,request.sendResponse(msg, HTTPResponse::XMLTOOLING_HTTP_STATUS_
UNAUTHORIZED
));
}
}
}
}