Skip to content
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

Jump to bottom

XrdHttp: don't call BuffConsume if getDataOneShot returns with a sock… #894

Closed
wants to merge 14 commits into from
Closed

XrdHttp: don't call BuffConsume if getDataOneShot returns with a sock… #894

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
39466cb
[Macaroons] WIP on implementing OAuth2 workflows.
bbockelm Nov 21, 2018
5329e54
WIP: checkpoint of OAuth2-based macaroon acquisition.
bbockelm Nov 30, 2018
4d1c88f
Port unquote helper function into Macaroon library.
bbockelm Dec 18, 2018
137338a
Allow Xrootd to respond back with an OAuth-style response.
bbockelm Dec 18, 2018
2c33ade
Finish implementation of token generator.
bbockelm Dec 18, 2018
28a5b5e
Add helper script for generating macaroons.
bbockelm Dec 18, 2018
492dfff
Make sure we null-terminate the request data.
bbockelm Dec 19, 2018
3b66682
Improve HTTP status codes.
bbockelm Dec 19, 2018
b50ab68
Correct key name versus OAuth standard.
bbockelm Dec 19, 2018
b98aad8
Expanding the default configuration files to use /etc/xrootd/config.d
Jan 8, 2019
02fe4c5
Add the config changes to the RPM package for the /etc/xrootd/config.…
Jan 8, 2019
24ae87e
Allow the state and stream objects to explicitly finalize.
bbockelm Jan 9, 2019
6cd6fff
Finalize successful transfers.
bbockelm Jan 9, 2019
ee6c164
XrdHttp: don't call BuffConsume if getDataOneShot returns with a sock…
apeters1971 Jan 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions packaging/common/xrootd-clustered.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,3 +51,9 @@ frm.xfr.copycmd /bin/cp /dev/null $PFN
#
all.adminpath /var/spool/xrootd
all.pidpath /var/run/xrootd

# More configuration files can be added in /etc/xrootd/config.d/
# For example /etc/xrootd/config.d/10-mygrid.cfg and
# /etc/xrootd/config.d/98-mysite-specifics.cfg
#
continue /etc/xrootd/config.d/
5 changes: 5 additions & 0 deletions packaging/common/xrootd-filecache-clustered.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,3 +88,8 @@ pfc.ram 100g

fi

# More configuration files can be added in /etc/xrootd/config.d/
# For example /etc/xrootd/config.d/10-mygrid.cfg and
# /etc/xrootd/config.d/98-mysite-specifics.cfg
#
continue /etc/xrootd/config.d/
5 changes: 5 additions & 0 deletions packaging/common/xrootd-filecache-standalone.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,8 @@ oss.localroot /data/xrd
pfc.ram 16g


# More configuration files can be added in /etc/xrootd/config.d/
# For example /etc/xrootd/config.d/10-mygrid.cfg and
# /etc/xrootd/config.d/98-mysite-specifics.cfg
#
continue /etc/xrootd/config.d/
5 changes: 5 additions & 0 deletions packaging/common/xrootd-http.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,8 @@ all.pidpath /var/run/xrootd
# systemd start xrdhttp.socket
#
xrd.protocol XrdHttp:80 /usr/lib64/libXrdHttp-4.so
# More configuration files can be added in /etc/xrootd/config.d/
# For example /etc/xrootd/config.d/10-mygrid.cfg and
# /etc/xrootd/config.d/98-mysite-specifics.cfg
#
continue /etc/xrootd/config.d/
6 changes: 6 additions & 0 deletions packaging/common/xrootd-standalone.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,9 @@ all.export /tmp
#
all.adminpath /var/spool/xrootd
all.pidpath /var/run/xrootd

# More configuration files can be added in /etc/xrootd/config.d/
# For example /etc/xrootd/config.d/10-mygrid.cfg and
# /etc/xrootd/config.d/98-mysite-specifics.cfg
#
continue /etc/xrootd/config.d/
7 changes: 7 additions & 0 deletions packaging/rhel/xrootd.spec.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,6 +499,9 @@ rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/xrootd/*
# ceph posix unversioned so
rm -f $RPM_BUILD_ROOT%{_libdir}/libXrdCephPosix.so

# config paths
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/config.d/

# var paths
mkdir -p $RPM_BUILD_ROOT%{_var}/log/xrootd
mkdir -p $RPM_BUILD_ROOT%{_var}/run/xrootd
Expand Down Expand Up @@ -720,6 +723,7 @@ fi
%attr(-,xrootd,xrootd) %dir %{_var}/log/xrootd
%attr(-,xrootd,xrootd) %dir %{_var}/run/xrootd
%attr(-,xrootd,xrootd) %dir %{_var}/spool/xrootd
%attr(-,xrootd,xrootd) %dir %{_sysconfdir}/%{name}/config.d
%config(noreplace) %{_sysconfdir}/logrotate.d/xrootd

%if %{use_systemd}
Expand Down Expand Up @@ -932,6 +936,9 @@ fi
# Changelog
#-------------------------------------------------------------------------------
%changelog
* Tue Jan 08 2019 Edgar Fajardo <emfajard@ucsd.edu>
- Create config dir /etc/xrootd/config.d

* Tue May 08 2018 Michal Simon <michal.simon@cern.ch>
- Make python3 sub-package optional

Expand Down
2 changes: 1 addition & 1 deletion src/XrdHttp/XrdHttpProtocol.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1359,7 +1359,7 @@ int XrdHttpProtocol::BuffgetData(int blen, char **data, bool wait) {

if (wait && (blen > BuffUsed())) {
TRACE(REQ, "BuffgetData: need to read " << blen - BuffUsed() << " bytes");
if (getDataOneShot(blen - BuffUsed(), true) < 0) return 0;
if ( getDataOneShot(blen - BuffUsed(), true) ) return 0;
}

if (myBuffStart < myBuffEnd) {
Expand Down