Skip to content

Commit 8c80adb

Browse files
committed
Motivation:
The Gridmap file plugin is redundant because the Multimap Plugin does the same as per Issue #7659 "drop gridmap-file support". Modification: remove: GridMapFilePlugin GridMapFileParser GridMapFileParserTest Edit the documentation and config files accrodingly. Add a simple script for gridmap > multimap file conversion to the documentation Result: Redundant plugins have been removed. The removal is documented Fixes: #7659 Target: master
1 parent dfad263 commit 8c80adb

7 files changed

Lines changed: 7 additions & 276 deletions

File tree

docs/TheBook/src/main/markdown/config-gplazma.md

Lines changed: 6 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -733,24 +733,6 @@ The GP2-AUTHZDB takes a username and maps it to UID+GID using the `storage-authz
733733
Default: `/etc/grid-security/storage-authzdb`
734734

735735

736-
737-
##### GridMap
738-
739-
> DEPRECATED: The `grid-mapfile` plug-in is deprecated and will be removed in a future release. Use the `multimap` plugin instead.
740-
741-
The `grid-mapfile` plug-in takes a GRID DN and maps it username using the **grid-mapfile** file.
742-
743-
744-
745-
Properties
746-
747-
**gplazma.gridmap.file**
748-
749-
Path to `grid-mapfile`
750-
Default: `/etc/grid-security/grid-mapfile`
751-
752-
753-
754736
##### vorolemap
755737

756738
> DEPRECATED: The `vorolemap` plug-in is deprecated and will be removed in a future release. Use the `multimap` plugin instead.
@@ -1976,27 +1958,14 @@ passwd testuser ae39aec3 read-write 12345 1000 / /
19761958

19771959
There are many more commands for altering the kpwd-file, see the dcache-script help for further commands available.
19781960

1979-
### The gridmap plug-in
1980-
1981-
Two file locations are defined in the policy file for this plug-in:
1982-
1983-
# grid-mapfile
1984-
gridMapFilePath="/etc/grid-security/grid-mapfile"
1985-
storageAuthzPath="/etc/grid-security/storage-authzdb"
1986-
1987-
#### Preparing the `grid-mapfile`
1988-
1989-
The `grid-mapfile` is the same as that used in other applications. It can be created in various ways, either by connecting directly to VOMS or GUMS servers, or by hand.
1961+
### The grid-map plug-in
1962+
The gridmap plug-in has been removed. Please migrate to the multimap plug-in instead.
1963+
For conversion of old gridmap files please use the script below:
19901964

1991-
Each line contains two fields: a DN (Certificate Subject) in quotes, and the username it is to be mapped to.
1992-
1993-
Example:
1994-
1995-
"/C=DE/O=GermanGrid/OU=DESY/CN=John Doe" johndoe
1965+
```console-user
1966+
sed '/^[# ]*"/s/"\(.*\)" \(.*\)$/dn:"\1" username:\2/' grid-mapfile > multimap-file
1967+
```
19961968

1997-
When using the `gridmap`, the `storage-authzdb` file must also be
1998-
configured. See [the section called
1999-
“storage-authzdb”](config-gplazma.md#storage-authzdb) for details.
20001969

20011970
## gPlazma specific dCache configuration
20021971

modules/gplazma2-grid/src/main/java/org/dcache/gplazma/plugins/GridMapFileParser.java

Lines changed: 0 additions & 56 deletions
This file was deleted.

modules/gplazma2-grid/src/main/java/org/dcache/gplazma/plugins/GridMapFilePlugin.java

Lines changed: 0 additions & 77 deletions
This file was deleted.

modules/gplazma2-grid/src/main/resources/META-INF/gplazma-plugins.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@
33
<name>vorolemap</name>
44
<class>org.dcache.gplazma.plugins.VoRoleMapPlugin</class>
55
</plugin>
6-
<plugin>
7-
<name>gridmap</name>
8-
<class>org.dcache.gplazma.plugins.GridMapFilePlugin</class>
9-
</plugin>
106
<plugin>
117
<name>authzdb</name>
128
<class>org.dcache.gplazma.plugins.AuthzDbPlugin</class>

modules/gplazma2-grid/src/test/java/org/dcache/gplazma/plugins/GridMapFileParserTest.java

Lines changed: 0 additions & 98 deletions
This file was deleted.

modules/gplazma2-krb5/src/main/java/org/dcache/gplazma/plugins/Krb5.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
/**
1414
* A {@link GPlazmaMappingPlugin} converts {@code user@DOMAIN.COM} to {@link UserNamePrincipal}
1515
* corresponding to {@code user} ( without domain ). For more complex mappings, like {@code
16-
* remte-user@DOMAIN.COM} to {@code local-user}, {@link GridMapFilePlugin} can be used.
16+
* remte-user@DOMAIN.COM} to {@code local-user}, {@code GplazmaMultiMapPlugin} can be used.
1717
* <p>
1818
* To enable, add following likes into gplazma.conf:
1919
* <pre>

skel/share/defaults/gplazma.properties

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,9 +137,6 @@ gplazma.authz.loginFailure.cache-size-expiry=1
137137
# Properties for gPlazma plugins
138138
# -----------------------------------------------------------------------
139139

140-
# ---- Path of the grid-mapfile file
141-
gplazma.gridmap.file=${dcache.paths.grid-security}/grid-mapfile
142-
143140
# ---- Path of the multi-map file
144141
gplazma.multimap.file=${dcache.paths.etc}/multi-mapfile
145142

0 commit comments

Comments
 (0)