Skip to content

Redirtoken #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Jo-stfc wants to merge 20 commits into
base: v5.7.3patched
Choose a base branch
from
Open

Redirtoken #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
ce2fad6
Add support for "Bad Gateway" HTTP status code
bbockelm Jul 26, 2024
7a00ed0
[XrdCl, Python] Use uint32_t for job ids and number of copy jobs
amadio Apr 11, 2024
43536c4
[XrdApps, XrdCl, XrdEc, Python] Use time_t for times and timeouts
amadio Apr 12, 2024
fcd2190
[Server] Implement extended error messages for proxy servers.
abh3 Jul 4, 2024
4feed8b
[Utils] Add method to convert bytes to human readable notation.
abh3 Jul 30, 2024
6ea9a30
[Utils] Fix missing class annotation.
abh3 Jul 30, 2024
51faab0
[XrdPss] Fix Clang -Winconsistent-missing-override warnings
amadio Jul 30, 2024
ecbc4ec
[Server] Add generic interface to report summary values for monitoring.
abh3 Aug 16, 2024
9933e04
[Server] Send Firefly packets from the client's perspective. Fixes #2322
abh3 Aug 29, 2024
1470338
[Server] Correct spelling (permision → permission)
ellert Sep 5, 2024
7836a0f
Protect against array index out of bounds
ellert Sep 7, 2024
f633e0f
Add error string to e2sMap if EBADE is out of range
ellert Sep 10, 2024
ca9c703
Change type in XrdSutCacheArg_t to long long
ellert Sep 9, 2024
c828132
Adjust CMake so macaroons can build with json-c
bbockelm Mar 23, 2024
1349803
Add new `http.redirtoken` functionality
bbockelm May 31, 2024
b69e55e
Extract out common generator code for macaroons
bbockelm Sep 15, 2024
439badd
Migrate XrdMacaroons to utilize the new generator class
bbockelm Sep 15, 2024
ef99485
Merge XrdMacaroon users to utilize the same configuration logic
bbockelm Sep 15, 2024
3a2be48
Bugfixes from hand-testing new common Macaroon generation code
bbockelm Sep 17, 2024
a4248b4
Fixup minor build issues on non-Mac OS X platforms
bbockelm Sep 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions bindings/python/src/PyXRootDCopyProcess.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,15 +101,15 @@ namespace PyXRootD

val = XrdCl::DefaultCPInitTimeout;
env->GetInt( "CPInitTimeout", val );
uint16_t initTimeout = val;
time_t initTimeout = val;

val = XrdCl::DefaultCPTPCTimeout;
env->GetInt( "CPTPCTimeout", val );
uint16_t tpcTimeout = val;
time_t tpcTimeout = val;

val = XrdCl::DefaultCPTimeout;
env->GetInt( "CPTimeout", val );
uint16_t cpTimeout = val;
time_t cpTimeout = val;

if ( !PyArg_ParseTupleAndKeywords( args, kwds, "ss|HbbbbssssbIHHHbHLLLbs:add_job",
(char**) kwlist,
Expand Down
10 changes: 5 additions & 5 deletions bindings/python/src/PyXRootDCopyProgressHandler.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ namespace PyXRootD
//----------------------------------------------------------------------------
// Notify when a new job is about to start
//----------------------------------------------------------------------------
void CopyProgressHandler::BeginJob( uint16_t jobNum,
uint16_t jobTotal,
void CopyProgressHandler::BeginJob( uint32_t jobNum,
uint32_t jobTotal,
const XrdCl::URL *source,
const XrdCl::URL *target )
{
Expand All @@ -54,7 +54,7 @@ namespace PyXRootD
//----------------------------------------------------------------------------
// Notify when the previous job has finished
//----------------------------------------------------------------------------
void CopyProgressHandler::EndJob( uint16_t jobNum,
void CopyProgressHandler::EndJob( uint32_t jobNum,
const XrdCl::PropertyList *result )
{
PyGILState_STATE state = PyGILState_Ensure();
Expand All @@ -74,7 +74,7 @@ namespace PyXRootD
//----------------------------------------------------------------------------
// Notify about the progress of the current job
//----------------------------------------------------------------------------
void CopyProgressHandler::JobProgress( uint16_t jobNum,
void CopyProgressHandler::JobProgress( uint32_t jobNum,
uint64_t bytesProcessed,
uint64_t bytesTotal )
{
Expand All @@ -93,7 +93,7 @@ namespace PyXRootD
//----------------------------------------------------------------------------
// Check if the job should be canceled
//----------------------------------------------------------------------------
bool CopyProgressHandler::ShouldCancel( uint16_t jobNum )
bool CopyProgressHandler::ShouldCancel( uint32_t jobNum )
{
PyGILState_STATE state = PyGILState_Ensure();
bool ret = false;
Expand Down
10 changes: 5 additions & 5 deletions bindings/python/src/PyXRootDCopyProgressHandler.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,28 +46,28 @@ namespace PyXRootD
//------------------------------------------------------------------------
//! Notify when a new job is about to start
//------------------------------------------------------------------------
virtual void BeginJob( uint16_t jobNum,
uint16_t jobTotal,
virtual void BeginJob( uint32_t jobNum,
uint32_t jobTotal,
const XrdCl::URL *source,
const XrdCl::URL *target );

//------------------------------------------------------------------------
//! Notify when the previous job has finished
//------------------------------------------------------------------------
virtual void EndJob( uint16_t jobNum,
virtual void EndJob( uint32_t jobNum,
const XrdCl::PropertyList *result );

//------------------------------------------------------------------------
//! Notify about the progress of the current job
//------------------------------------------------------------------------
virtual void JobProgress( uint16_t jobNum,
virtual void JobProgress( uint32_t jobNum,
uint64_t bytesProcessed,
uint64_t bytesTotal );

//------------------------------------------------------------------------
//! Determine whether the job should be canceled
//------------------------------------------------------------------------
virtual bool ShouldCancel(uint16_t jobNum);
virtual bool ShouldCancel(uint32_t jobNum);

public:
PyObject *handler;
Expand Down
52 changes: 26 additions & 26 deletions bindings/python/src/PyXRootDFile.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ namespace PyXRootD
const char *url;
XrdCl::OpenFlags::Flags flags = XrdCl::OpenFlags::None;
XrdCl::Access::Mode mode = XrdCl::Access::None;
uint16_t timeout = 0;
time_t timeout = 0;
PyObject *callback = NULL, *pystatus = NULL;
XrdCl::XRootDStatus status;

Expand Down Expand Up @@ -75,7 +75,7 @@ namespace PyXRootD
PyObject* File::Close( File *self, PyObject *args, PyObject *kwds )
{
static const char *kwlist[] = { "timeout", "callback", NULL };
uint16_t timeout = 0;
time_t timeout = 0;
PyObject *callback = NULL, *pystatus = NULL;
XrdCl::XRootDStatus status;

Expand Down Expand Up @@ -107,7 +107,7 @@ namespace PyXRootD
{
static const char *kwlist[] = { "force", "timeout", "callback", NULL };
int force = 0;
uint16_t timeout = 0;
time_t timeout = 0;
PyObject *callback = NULL, *pyresponse = NULL, *pystatus = NULL;
XrdCl::XRootDStatus status;

Expand Down Expand Up @@ -146,7 +146,7 @@ namespace PyXRootD
NULL };
uint64_t offset = 0;
uint32_t size = 0;
uint16_t timeout = 0;
time_t timeout = 0;
PyObject *callback = NULL, *pystatus = NULL, *pyresponse = NULL;
PyObject *py_offset = NULL, *py_size = NULL, *py_timeout = NULL;
char *buffer = 0;
Expand All @@ -159,20 +159,20 @@ namespace PyXRootD

unsigned long long tmp_offset = 0;
unsigned int tmp_size = 0;
unsigned short int tmp_timeout = 0;
unsigned int tmp_timeout = 0;

if ( py_offset && PyObjToUllong( py_offset, &tmp_offset, "offset" ) )
return NULL;

if ( py_size && PyObjToUint(py_size, &tmp_size, "size" ) )
return NULL;

if ( py_timeout && PyObjToUshrt(py_timeout, &tmp_timeout, "timeout" ) )
if ( py_timeout && PyObjToUint(py_timeout, &tmp_timeout, "timeout" ) )
return NULL;

offset = (uint64_t)tmp_offset;
size = (uint32_t)tmp_size;
timeout = (uint16_t)tmp_timeout;
timeout = (time_t)tmp_timeout;

if (!size) {
XrdCl::StatInfo *info = 0;
Expand Down Expand Up @@ -426,7 +426,7 @@ namespace PyXRootD
Py_ssize_t buffsize;
uint64_t offset = 0;
uint32_t size = 0;
uint16_t timeout = 0;
time_t timeout = 0;
PyObject *callback = NULL, *pystatus = NULL;
PyObject *py_offset = NULL, *py_size = NULL, *py_timeout = NULL;
XrdCl::XRootDStatus status;
Expand All @@ -439,20 +439,20 @@ namespace PyXRootD

unsigned long long tmp_offset = 0;
unsigned int tmp_size = 0;
unsigned short int tmp_timeout = 0;
unsigned int tmp_timeout = 0;

if (py_offset && PyObjToUllong(py_offset, &tmp_offset, "offset"))
return NULL;

if (py_size && PyObjToUint(py_size, &tmp_size, "size"))
return NULL;

if (py_timeout && PyObjToUshrt(py_timeout, &tmp_timeout, "timeout"))
if (py_timeout && PyObjToUint(py_timeout, &tmp_timeout, "timeout"))
return NULL;

offset = (uint64_t)tmp_offset;
size = (uint32_t)tmp_size;
timeout = (uint16_t)tmp_timeout;
timeout = (time_t)tmp_timeout;

if (!size) {
size = buffsize;
Expand Down Expand Up @@ -482,7 +482,7 @@ namespace PyXRootD
PyObject* File::Sync( File *self, PyObject *args, PyObject *kwds )
{
static const char *kwlist[] = { "timeout", "callback", NULL };
uint16_t timeout = 0;
time_t timeout = 0;
PyObject *callback = NULL, *pystatus = NULL;
XrdCl::XRootDStatus status;

Expand Down Expand Up @@ -515,7 +515,7 @@ namespace PyXRootD
{
static const char *kwlist[] = { "size", "timeout", "callback", NULL };
uint64_t size;
uint16_t timeout = 0;
time_t timeout = 0;
PyObject *callback = NULL, *pystatus = NULL;
PyObject *py_size = NULL, *py_timeout = NULL;
XrdCl::XRootDStatus status;
Expand All @@ -526,16 +526,16 @@ namespace PyXRootD
(char**) kwlist, &py_size, &py_timeout, &callback ) ) return NULL;

unsigned long long tmp_size = 0;
unsigned short int tmp_timeout = 0;
unsigned int tmp_timeout = 0;

if ( py_size && PyObjToUllong( py_size, &tmp_size, "size" ) )
return NULL;

if ( py_timeout && PyObjToUshrt( py_timeout, &tmp_timeout, "timeout" ) )
if ( py_timeout && PyObjToUint( py_timeout, &tmp_timeout, "timeout" ) )
return NULL;

size = (uint64_t)tmp_size;
timeout = (uint16_t)tmp_timeout;
timeout = (time_t)tmp_timeout;

if ( callback && callback != Py_None ) {
XrdCl::ResponseHandler *handler = GetHandler<XrdCl::AnyObject>( callback );
Expand All @@ -561,7 +561,7 @@ namespace PyXRootD
PyObject* File::VectorRead( File *self, PyObject *args, PyObject *kwds )
{
static const char *kwlist[] = { "chunks", "timeout", "callback", NULL };
uint16_t timeout = 0;
time_t timeout = 0;
uint64_t offset = 0;
uint32_t length = 0;
PyObject *pychunks = NULL, *callback = NULL;
Expand All @@ -574,12 +574,12 @@ namespace PyXRootD
if ( !PyArg_ParseTupleAndKeywords( args, kwds, "O|OO:vector_read",
(char**) kwlist, &pychunks, &py_timeout, &callback ) ) return NULL;

unsigned short int tmp_timeout = 0;
unsigned int tmp_timeout = 0;

if ( py_timeout && PyObjToUshrt( py_timeout, &tmp_timeout, "timeout" ) )
if ( py_timeout && PyObjToUint( py_timeout, &tmp_timeout, "timeout" ) )
return NULL;

timeout = (uint16_t)tmp_timeout;
timeout = (time_t)tmp_timeout;

if ( !PyList_Check( pychunks ) ) {
PyErr_SetString( PyExc_TypeError, "chunks parameter must be a list" );
Expand Down Expand Up @@ -654,7 +654,7 @@ namespace PyXRootD
static const char *kwlist[] = { "arg", "timeout", "callback", NULL };
const char *buffer = 0;
Py_ssize_t buffSize = 0;
uint16_t timeout = 0;
time_t timeout = 0;
PyObject *callback = NULL, *pystatus = NULL, *pyresponse = NULL;
XrdCl::XRootDStatus status;

Expand Down Expand Up @@ -696,7 +696,7 @@ namespace PyXRootD
PyObject* File::Visa( File *self, PyObject *args, PyObject *kwds )
{
static const char *kwlist[] = { "timeout", "callback", NULL };
uint16_t timeout = 0;
time_t timeout = 0;
PyObject *callback = NULL, *pystatus = NULL, *pyresponse = NULL;
XrdCl::XRootDStatus status;

Expand Down Expand Up @@ -782,7 +782,7 @@ namespace PyXRootD
static const char *kwlist[] = { "attrs", "timeout", "callback", NULL };

std::vector<XrdCl::xattr_t> attrs;
uint16_t timeout = 0;
time_t timeout = 0;

PyObject *callback = NULL, *pystatus = NULL;
PyObject *pyattrs = NULL, *pyresponse = NULL;
Expand Down Expand Up @@ -853,7 +853,7 @@ namespace PyXRootD
static const char *kwlist[] = { "attrs", "timeout", "callback", NULL };

std::vector<std::string> attrs;
uint16_t timeout = 0;
time_t timeout = 0;

PyObject *callback = NULL, *pystatus = NULL;
PyObject *pyattrs = NULL, *pyresponse = NULL;
Expand Down Expand Up @@ -912,7 +912,7 @@ namespace PyXRootD
static const char *kwlist[] = { "attrs", "timeout", "callback", NULL };

std::vector<std::string> attrs;
uint16_t timeout = 0;
time_t timeout = 0;

PyObject *callback = NULL, *pystatus = NULL;
PyObject *pyattrs = NULL, *pyresponse = NULL;
Expand Down Expand Up @@ -970,7 +970,7 @@ namespace PyXRootD
{
static const char *kwlist[] = { "timeout", "callback", NULL };

uint16_t timeout = 0;
time_t timeout = 0;

PyObject *callback = NULL, *pystatus = NULL;
PyObject *pyresponse = NULL;
Expand Down
Loading
Loading