diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..6ce1305 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/mod_lookup_identity-0.9.2.tar.gz diff --git a/.mod_lookup_identity.metadata b/.mod_lookup_identity.metadata new file mode 100644 index 0000000..39de051 --- /dev/null +++ b/.mod_lookup_identity.metadata @@ -0,0 +1 @@ +dbd16dc48e89ef5968e53baec2bbfb883c205c46 SOURCES/mod_lookup_identity-0.9.2.tar.gz diff --git a/README.md b/README.md deleted file mode 100644 index 98f42b4..0000000 --- a/README.md +++ /dev/null @@ -1,4 +0,0 @@ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 -If you find this file in a distro specific branch, it means that no content has been checked in yet diff --git a/SPECS/mod_lookup_identity.spec b/SPECS/mod_lookup_identity.spec new file mode 100644 index 0000000..3681ed7 --- /dev/null +++ b/SPECS/mod_lookup_identity.spec @@ -0,0 +1,110 @@ +%{!?_httpd_mmn: %{expand: %%global _httpd_mmn %%(cat %{_includedir}/httpd/.mmn || echo 0-0)}} +%{!?_httpd_apxs: %{expand: %%global _httpd_apxs %%{_sbindir}/apxs}} +%{!?_httpd_confdir: %{expand: %%global _httpd_confdir %%{_sysconfdir}/httpd/conf.d}} +# /etc/httpd/conf.d with httpd < 2.4 and defined as /etc/httpd/conf.modules.d with httpd >= 2.4 +%{!?_httpd_modconfdir: %{expand: %%global _httpd_modconfdir %%{_sysconfdir}/httpd/conf.d}} +%{!?_httpd_moddir: %{expand: %%global _httpd_moddir %%{_libdir}/httpd/modules}} + +Summary: Apache module to retrieve additional information about the authenticated user +Name: mod_lookup_identity +Version: 0.9.2 +Release: 1%{?dist} +License: ASL 2.0 +Group: System Environment/Daemons +URL: http://www.adelton.com/apache/mod_lookup_identity/ +Source0: http://www.adelton.com/apache/mod_lookup_identity/%{name}-%{version}.tar.gz +BuildRequires: httpd-devel +BuildRequires: dbus-devel +BuildRequires: pkgconfig +Requires(pre): httpd +Requires: httpd-mmn = %{_httpd_mmn} + +# Suppres auto-provides for module DSO per +# https://fedoraproject.org/wiki/Packaging:AutoProvidesAndRequiresFiltering#Summary +%{?filter_provides_in: %filter_provides_in %{_libdir}/httpd/modules/.*\.so$} +%{?filter_setup} + +%description +mod_lookup_identity can retrieve additional pieces of information +about user authenticated in Apache httpd server and store these values +in notes/environment variables to be consumed by web applications. +Use of REMOTE_USER_* environment variables is recommended. + +%prep +%setup -q -n %{name}-%{version} + +%build +%{_httpd_apxs} -c -Wc,"%{optflags} -Wall -pedantic -std=c99 $(pkg-config --cflags dbus-1)" $(pkg-config --libs dbus-1) mod_lookup_identity.c +%if "%{_httpd_modconfdir}" != "%{_httpd_confdir}" +echo > lookup_identity.confx +echo "# Load the module in %{_httpd_modconfdir}/55-lookup_identity.conf" >> lookup_identity.confx +cat lookup_identity.conf >> lookup_identity.confx +%else +cat lookup_identity.module > lookup_identity.confx +cat lookup_identity.conf >> lookup_identity.confx +%endif + +%install +rm -rf $RPM_BUILD_ROOT +install -Dm 755 .libs/mod_lookup_identity.so $RPM_BUILD_ROOT%{_httpd_moddir}/mod_lookup_identity.so + +%if "%{_httpd_modconfdir}" != "%{_httpd_confdir}" +# httpd >= 2.4.x +install -Dp -m 0644 lookup_identity.module $RPM_BUILD_ROOT%{_httpd_modconfdir}/55-lookup_identity.conf +%endif +install -Dp -m 0644 lookup_identity.confx $RPM_BUILD_ROOT%{_httpd_confdir}/lookup_identity.conf + +%files +%doc README LICENSE +%if "%{_httpd_modconfdir}" != "%{_httpd_confdir}" +%config(noreplace) %{_httpd_modconfdir}/55-lookup_identity.conf +%endif +%config(noreplace) %{_httpd_confdir}/lookup_identity.conf +%{_httpd_moddir}/*.so + +%changelog +* Fri Jun 27 2014 Jan Pazdziora - 0.9.2-1 +- Fix error handling and reporting. +- Fix module loading/configuration for Apache 2.4. + +* Tue May 13 2014 Jan Pazdziora - 0.9.1-1 +- Address code issues revealed by coverity scan. +- Minor README fixes. + +* Tue May 13 2014 Jan Pazdziora - 0.9.0-1 +- Add support for '+'-prefixed note/variable names. +- Silence compile warnings by specifying C99. +- Fix format of logs of dbus calls. + +* Sat Feb 01 2014 Jan Pazdziora - 0.8.3-1 +- 1058812 - drop explicit dbus-libs dependency. + +* Thu Jan 30 2014 Jan Pazdziora - 0.8.2-1 +- 1058812 - .spec changes for Fedora package review. + +* Fri Jan 17 2014 Jan Pazdziora - 0.8.1-1 +- Ensure we run before mod_headers so that our result can be put to + request headers for mod_proxy. + +* Thu Jan 09 2014 Jan Pazdziora - 0.8-1 +- Declare all functions static for proper isolation. + +* Thu Nov 21 2013 Jan Pazdziora - 0.7.1-1 +- Address segfault when no LookupUserAttrIter is set. + +* Tue Nov 19 2013 Jan Pazdziora - 0.7-1 +- Define lookup_identity_hook as optional function, callable from + other modules. + +* Mon Nov 18 2013 Jan Pazdziora - 0.6-1 +- Use org.freedesktop.sssd.infopipe.GetUserGroups for group lists. +- Support new org.freedesktop.sssd.infopipe.GetUserAttr parameters / + return values. +- Removed LookupOutputGroupsSeparator. +- LookupOutputGroups and LookupUserAttr now support separator as + optional second parameter. +- Added LookupUserGroupsIter and LookupUserAttrIter. +- Added LookupDbusTimeout. + +* Mon Oct 28 2013 Jan Pazdziora - 0.5-1 +- Initial release.