Skip to content

Commit

Permalink
Merge pull request StackStorm#71 from StackStorm/update-license
Browse files Browse the repository at this point in the history
Update to the Apache 2.0 license
  • Loading branch information
m4dcoder authored Jun 11, 2020
2 parents cf18639 + 425dca5 commit 53a1ec9
Show file tree
Hide file tree
Showing 15 changed files with 543 additions and 406 deletions.
324 changes: 201 additions & 123 deletions LICENSE

Large diffs are not rendered by default.

14 changes: 11 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,8 +1,16 @@
# Copyright (C) 2020 Extreme Networks, Inc - All Rights Reserved
#
# Unauthorized copying of this file, via any medium is strictly
# prohibited. Proprietary and confidential. See the LICENSE file
# included with this work for details.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

SHELL := /bin/bash
PKG_NAME := st2-auth-ldap
Expand Down
8 changes: 5 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
# LDAP Authentication Backend for StackStorm Enterprise Edition

[![Circle CI Build Status](https://circleci.com/gh/extremenetworks/st2-enterprise-auth-backend-ldap.svg?style=shield&circle-token=3bfc47f8b1f7af9c1845ea79df2c18e0f32cc509)](https://circleci.com/gh/extremenetworks/st2-enterprise-auth-backend-ldap)

## Requirements

Ubuntu / Debian
Expand Down Expand Up @@ -86,6 +84,10 @@ make unit-tests

Copyright 2015-2020 Extreme Networks, Inc.

Unauthorized copying of this file, via any medium is strictly prohibited. Proprietary and confidential. See the [LICENSE](LICENSE) file included with this work for details.
Copyright 2020 StackStorm, Inc.

Licensed under the Apache License, Version 2.0 (the "License"); you may not use this work except in compliance with the License. You may obtain a copy of the License in the [LICENSE](LICENSE) file, or at:

[http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)

By contributing you agree that these contributions are your own (or approved by your employer) and you grant a full, complete, irrevocable copyright license to all users and developers of the project, present and future, pursuant to the license of the project.
7 changes: 3 additions & 4 deletions debian/control
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
Source: st2-auth-ldap
Section: Python
Priority: optional
Maintainer: Extreme Networks <support@extremenetworks.com>
Maintainer: StackStorm Engineering <opsadmin@stackstorm.com>
Build-Depends: debhelper (>= 8.0.0)
Standards-Version: 3.9.4
Homepage: https://www.extremenetworks.com/product/workflow-composer/
Homepage: http://stackstorm.com/

Package: st2-auth-ldap
Architecture: amd64
Pre-Depends: st2
Depends: ${misc:Depends}, st2, libldap-2.4-2
Description: LDAP auth backend for EWC
LDAP Authentication Backend for Extreme Workflow Composer
Description: LDAP authentication backend for StackStorm
143 changes: 21 additions & 122 deletions debian/copyright

Large diffs are not rendered by default.

14 changes: 11 additions & 3 deletions dist_utils.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,17 @@
# -*- coding: utf-8 -*-
# Copyright (C) 2020 Extreme Networks, Inc - All Rights Reserved
#
# Unauthorized copying of this file, via any medium is strictly
# prohibited. Proprietary and confidential. See the LICENSE file
# included with this work for details.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

from __future__ import absolute_import

Expand Down
324 changes: 201 additions & 123 deletions rpm/LICENSE

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions rpm/st2-auth-ldap.spec
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ Version: %{version}
Epoch: %{epoch}
%endif
Release: %{release}
License: Extreme Workflow Composer EULA
Summary: LDAP authentication plugin for EWC
URL: https://www.extremenetworks.com/product/workflow-composer/
License: Apache 2.0
Summary: LDAP authentication plugin for StackStorm
URL: https://stackstorm.com
Source0: st2-enterprise-auth-backend-ldap

Requires: st2 openldap
Expand All @@ -28,7 +28,7 @@ Requires: st2 openldap
%define _rpmdir %(pwd)/build

%description
LDAP Authentication Backend for Extreme Workflow Composer
LDAP Authentication Backend for StackStorm

%prep
rm -rf %{buildroot}
Expand Down
23 changes: 16 additions & 7 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,16 @@
# Copyright (C) 2020 Extreme Networks, Inc - All Rights Reserved
# Unauthorized copying of this file, via any medium is strictly prohibited
# Proprietary and confidential.
# See the LICENSE file included with this work for details.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

import os

Expand All @@ -26,12 +35,12 @@
setup(
name='st2-enterprise-auth-backend-ldap',
version=version,
description='StackStorm enterprise authentication backend for LDAP.',
description='StackStorm authentication backend for LDAP.',
author='StackStorm, Inc.',
author_email='[email protected]',
url='https://github.com/extremenetworks/st2-enterprise-auth-backend-ldap',
license='Proprietary License',
download_url='https://github.com/extremenetworks/st2-enterprise-auth-backend-ldap/tarball/master',
url='https://stackstorm.com/',
license='Apache License (2.0)',
download_url='https://stackstorm.com/',
classifiers=[
'License :: Other/Proprietary License'
'Programming Language :: Python',
Expand Down
14 changes: 11 additions & 3 deletions st2auth_enterprise_ldap_backend/__init__.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,16 @@
# Copyright (C) 2020 Extreme Networks, Inc - All Rights Reserved
#
# Unauthorized copying of this file, via any medium is strictly
# prohibited. Proprietary and confidential. See the LICENSE file
# included with this work for details.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

from __future__ import absolute_import

Expand Down
14 changes: 11 additions & 3 deletions st2auth_enterprise_ldap_backend/ldap_backend.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,16 @@
# Copyright (C) 2020 Extreme Networks, Inc - All Rights Reserved
#
# Unauthorized copying of this file, via any medium is strictly
# prohibited. Proprietary and confidential. See the LICENSE file
# included with this work for details.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

# pylint: disable=no-member

Expand Down
14 changes: 12 additions & 2 deletions tests/integration/test_active_directory.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,16 @@
# Copyright (C) 2020 Extreme Networks, Inc - All Rights Reserved
# Unauthorized copying of this file, via any medium is strictly prohibited
# Proprietary and confidential
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

import os
import unittest2
Expand Down
14 changes: 12 additions & 2 deletions tests/integration/test_openldap.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,16 @@
# Copyright (C) 2020 Extreme Networks, Inc - All Rights Reserved
# Unauthorized copying of this file, via any medium is strictly prohibited
# Proprietary and confidential
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

import os
import unittest2
Expand Down
14 changes: 12 additions & 2 deletions tests/unit/test_backend.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,16 @@
# Copyright (C) 2020 Extreme Networks, Inc - All Rights Reserved
# Unauthorized copying of this file, via any medium is strictly prohibited
# Proprietary and confidential
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

import os
import time
Expand Down
14 changes: 12 additions & 2 deletions tests/unit/test_config.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,16 @@
# Copyright (C) 2020 Extreme Networks, Inc - All Rights Reserved
# Unauthorized copying of this file, via any medium is strictly prohibited
# Proprietary and confidential
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

import ldap
import os
Expand Down

0 comments on commit 53a1ec9

Please sign in to comment.