Skip to content

Commit 46f1ba5

Browse files
authored
Merge pull request #66 from efajardo/SOFTWARE-3774.cms-xcache-auth
Adding authorization pieces to CMS Xcache
2 parents 328983b + 4f2e025 commit 46f1ba5

3 files changed

Lines changed: 28 additions & 8 deletions

File tree

configs/cms-xcache/config.d/50-cms-xcache-authz.cfg

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,24 @@
66
# **********************************************************************
77
#
88
# This file is part of the CMS XCache Daemon
9+
xrd.allow host *
910

10-
# Allow connections from all hosts
11-
xrd.allow host *
12-
sec.protocol host
13-
sec.protbind * none
11+
# Enable the gsi authentication using lcmaps
12+
13+
sec.protocol /usr/lib64 gsi \
14+
-certdir:/etc/grid-security/certificates \
15+
-cert:/etc/grid-security/xrd/xrdcert.pem \
16+
-key:/etc/grid-security/xrd/xrdkey.pem \
17+
-crl:1 -authzfun:libXrdLcmaps.so \
18+
-authzfunparms:--lcmapscfg=/etc/xrootd/lcmaps.cfg,\
19+
--loglevel=1 \
20+
-gmapopt:10 -gmapto:0
21+
22+
# The Authorization file for which users can do which actions:
23+
# https://opensciencegrid.org/docs/data/xrootd/xrootd-authorization/
24+
acc.authdb /etc/xrootd/Authfile-cms-xcache
25+
26+
sec.protbind * gsi
27+
ofs.authorize 1
28+
acc.audit deny grant
29+
xrootd.seclib /usr/lib64/libXrdSec.so
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
g /cms /store rl

rpm/xcache.spec

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Name: xcache
22
Summary: XCache scripts and configurations
3-
Version: 1.0.5
4-
Release: 1%{?dist}
3+
Version: 1.1.0
4+
Release: 0.1%{?dist}
55
License: Apache 2.0
66
Group: Grid
77
URL: https://opensciencegrid.org/docs/
@@ -103,10 +103,9 @@ Summary: The CMS data federation cache server
103103

104104
Requires: %{name} = %{version}
105105
Requires: wget
106-
106+
Requires: xrootd-lcmaps >= 1.5.1
107107
%description -n cms-xcache
108108
%{summary}
109-
110109
%post -n cms-xcache
111110
%systemd_post xrootd@cms-xcache.service cmsd@cms-xcache.service
112111
%preun -n cms-xcache
@@ -192,6 +191,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/grid-security/xrd
192191

193192
%files -n cms-xcache
194193
%config %{_sysconfdir}/xrootd/xrootd-cms-xcache.cfg
194+
%config %{_sysconfdir}/xrootd/Authfile-cms-xcache
195195
%{_unitdir}/xrootd@cms-xcache.service.d/10-cms-xcache-overrides.conf
196196
%{_unitdir}/cmsd@cms-xcache.service.d/10-cms-xcache-overrides.conf
197197
%config %{_sysconfdir}/xrootd/config.d/40-cms-xcache-plugin.cfg
@@ -202,6 +202,9 @@ mkdir -p %{buildroot}%{_sysconfdir}/grid-security/xrd
202202
%config(noreplace) %{_sysconfdir}/xrootd/config.d/95-cms-xcache-logging.cfg
203203

204204
%changelog
205+
* Wed Jul 31 2019 Edgar Fajardo <emfajard@ucsd.edu> - 1.1.0-0.1
206+
- Add ATLAS and CMS XCache (SOFTWARE-3583, SOFTWARE-3584)
207+
205208
* Wed May 01 2019 Mátyás Selmeci <matyas@cs.wisc.edu> - 1.0.5-1
206209
- Start services after network is up (SOFTWARE-3681)
207210

0 commit comments

Comments
 (0)