Final correction of license notifications

nccgroup · Aug 25, 2019 · 3195034 · 3195034
1 parent 2ab877e
commit 3195034
Show file tree

Hide file tree

Showing 46 changed files with 79 additions and 645 deletions.
diff --git a/pmapper.py b/pmapper.py
@@ -4,7 +4,8 @@
 Wrap around principalmapper/__main__.py
 """
 
-#  Copyright NCC Group (c) 2019. This file is part of Principal Mapper.
+
+#  Copyright (c) NCC Group and Erik Steringer 2019. This file is part of Principal Mapper.
 #
 #      Principal Mapper is free software: you can redistribute it and/or modify
 #      it under the terms of the GNU Affero General Public License as published by
@@ -18,19 +19,6 @@
 #
 #      You should have received a copy of the GNU Affero General Public License
 #      along with Principal Mapper.  If not, see <https://www.gnu.org/licenses/>.
-#
-#      Principal Mapper is free software: you can redistribute it and/or modify
-#      it under the terms of the GNU Affero General Public License as published by
-#      the Free Software Foundation, either version 3 of the License, or
-#      (at your option) any later version.
-#
-#      Principal Mapper is distributed in the hope that it will be useful,
-#      but WITHOUT ANY WARRANTY; without even the implied warranty of
-#      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#      GNU General Public License for more details.
-#
-#      You should have received a copy of the GNU Affero General Public License
-#      along with Foobar.  If not, see <https://www.gnu.org/licenses/>.
 
 import sys
 

diff --git a/principalmapper/__init__.py b/principalmapper/__init__.py
@@ -1,6 +1,6 @@
 """Module principalmapper: Python code to dissect and analyze an AWS account's use of IAM"""
 
-#  Copyright NCC Group (c) 2019. This file is part of Principal Mapper.
+#  Copyright (c) NCC Group and Erik Steringer 2019. This file is part of Principal Mapper.
 #
 #      Principal Mapper is free software: you can redistribute it and/or modify
 #      it under the terms of the GNU Affero General Public License as published by
@@ -14,18 +14,5 @@
 #
 #      You should have received a copy of the GNU Affero General Public License
 #      along with Principal Mapper.  If not, see <https://www.gnu.org/licenses/>.
-#
-#      Principal Mapper is free software: you can redistribute it and/or modify
-#      it under the terms of the GNU Affero General Public License as published by
-#      the Free Software Foundation, either version 3 of the License, or
-#      (at your option) any later version.
-#
-#      Principal Mapper is distributed in the hope that it will be useful,
-#      but WITHOUT ANY WARRANTY; without even the implied warranty of
-#      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#      GNU General Public License for more details.
-#
-#      You should have received a copy of the GNU Affero General Public License
-#      along with Foobar.  If not, see <https://www.gnu.org/licenses/>.
 
 __version__ = '1.0.0'
diff --git a/principalmapper/__main__.py b/principalmapper/__main__.py
@@ -2,7 +2,7 @@
 Provides a command-line interface to use the principalmapper library
 """
 
-#  Copyright NCC Group (c) 2019. This file is part of Principal Mapper.
+#  Copyright (c) NCC Group and Erik Steringer 2019. This file is part of Principal Mapper.
 #
 #      Principal Mapper is free software: you can redistribute it and/or modify
 #      it under the terms of the GNU Affero General Public License as published by
@@ -16,19 +16,6 @@
 #
 #      You should have received a copy of the GNU Affero General Public License
 #      along with Principal Mapper.  If not, see <https://www.gnu.org/licenses/>.
-#
-#      Principal Mapper is free software: you can redistribute it and/or modify
-#      it under the terms of the GNU Affero General Public License as published by
-#      the Free Software Foundation, either version 3 of the License, or
-#      (at your option) any later version.
-#
-#      Principal Mapper is distributed in the hope that it will be useful,
-#      but WITHOUT ANY WARRANTY; without even the implied warranty of
-#      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#      GNU General Public License for more details.
-#
-#      You should have received a copy of the GNU Affero General Public License
-#      along with Foobar.  If not, see <https://www.gnu.org/licenses/>.
 
 import argparse
 import os

diff --git a/principalmapper/analysis/__init__.py b/principalmapper/analysis/__init__.py
@@ -1,4 +1,4 @@
-#  Copyright NCC Group (c) 2019. This file is part of Principal Mapper.
+#  Copyright (c) NCC Group and Erik Steringer 2019. This file is part of Principal Mapper.
 #
 #      Principal Mapper is free software: you can redistribute it and/or modify
 #      it under the terms of the GNU Affero General Public License as published by
@@ -12,17 +12,6 @@
 #
 #      You should have received a copy of the GNU Affero General Public License
 #      along with Principal Mapper.  If not, see <https://www.gnu.org/licenses/>.
-#
-#      Principal Mapper is free software: you can redistribute it and/or modify
-#      it under the terms of the GNU Affero General Public License as published by
-#      the Free Software Foundation, either version 3 of the License, or
-#      (at your option) any later version.
-#
-#      Principal Mapper is distributed in the hope that it will be useful,
-#      but WITHOUT ANY WARRANTY; without even the implied warranty of
-#      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#      GNU General Public License for more details.
-#
-#      You should have received a copy of the GNU Affero General Public License
-#      along with Foobar.  If not, see <https://www.gnu.org/licenses/>.
+
+
 
diff --git a/principalmapper/analysis/risks.py b/principalmapper/analysis/risks.py
@@ -9,7 +9,9 @@
 }
 """
 
-#  Copyright NCC Group (c) 2019. This file is part of Principal Mapper.
+
+
+#  Copyright (c) NCC Group and Erik Steringer 2019. This file is part of Principal Mapper.
 #
 #      Principal Mapper is free software: you can redistribute it and/or modify
 #      it under the terms of the GNU Affero General Public License as published by
@@ -23,19 +25,6 @@
 #
 #      You should have received a copy of the GNU Affero General Public License
 #      along with Principal Mapper.  If not, see <https://www.gnu.org/licenses/>.
-#
-#      Principal Mapper is free software: you can redistribute it and/or modify
-#      it under the terms of the GNU Affero General Public License as published by
-#      the Free Software Foundation, either version 3 of the License, or
-#      (at your option) any later version.
-#
-#      Principal Mapper is distributed in the hope that it will be useful,
-#      but WITHOUT ANY WARRANTY; without even the implied warranty of
-#      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#      GNU General Public License for more details.
-#
-#      You should have received a copy of the GNU Affero General Public License
-#      along with Foobar.  If not, see <https://www.gnu.org/licenses/>.
 
 import datetime as dt
 import json

diff --git a/principalmapper/common/__init__.py b/principalmapper/common/__init__.py
@@ -1,4 +1,4 @@
-#  Copyright NCC Group (c) 2019. This file is part of Principal Mapper.
+#  Copyright (c) NCC Group and Erik Steringer 2019. This file is part of Principal Mapper.
 #
 #      Principal Mapper is free software: you can redistribute it and/or modify
 #      it under the terms of the GNU Affero General Public License as published by
@@ -12,18 +12,7 @@
 #
 #      You should have received a copy of the GNU Affero General Public License
 #      along with Principal Mapper.  If not, see <https://www.gnu.org/licenses/>.
-#
-#      Principal Mapper is free software: you can redistribute it and/or modify
-#      it under the terms of the GNU Affero General Public License as published by
-#      the Free Software Foundation, either version 3 of the License, or
-#      (at your option) any later version.
-#
-#      Principal Mapper is distributed in the hope that it will be useful,
-#      but WITHOUT ANY WARRANTY; without even the implied warranty of
-#      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#      GNU General Public License for more details.
-#
-#      You should have received a copy of the GNU Affero General Public License
-#      along with Foobar.  If not, see <https://www.gnu.org/licenses/>.
+
+
 
 """Module defining classes and functions used commonly across principalmapper"""
diff --git a/principalmapper/common/edges.py b/principalmapper/common/edges.py
@@ -1,6 +1,8 @@
 """Python code for implementing the edges of a graph"""
 
-#  Copyright NCC Group (c) 2019. This file is part of Principal Mapper.
+
+
+#  Copyright (c) NCC Group and Erik Steringer 2019. This file is part of Principal Mapper.
 #
 #      Principal Mapper is free software: you can redistribute it and/or modify
 #      it under the terms of the GNU Affero General Public License as published by
@@ -14,19 +16,6 @@
 #
 #      You should have received a copy of the GNU Affero General Public License
 #      along with Principal Mapper.  If not, see <https://www.gnu.org/licenses/>.
-#
-#      Principal Mapper is free software: you can redistribute it and/or modify
-#      it under the terms of the GNU Affero General Public License as published by
-#      the Free Software Foundation, either version 3 of the License, or
-#      (at your option) any later version.
-#
-#      Principal Mapper is distributed in the hope that it will be useful,
-#      but WITHOUT ANY WARRANTY; without even the implied warranty of
-#      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#      GNU General Public License for more details.
-#
-#      You should have received a copy of the GNU Affero General Public License
-#      along with Foobar.  If not, see <https://www.gnu.org/licenses/>.
 
 from principalmapper.common.nodes import Node
 from principalmapper.util import arns

diff --git a/principalmapper/common/graphs.py b/principalmapper/common/graphs.py
@@ -4,7 +4,9 @@
 create a graph object, you need all the policies, then all the groups, then you can build the lists of nodes and edges.
 """
 
-#  Copyright NCC Group (c) 2019. This file is part of Principal Mapper.
+
+
+#  Copyright (c) NCC Group and Erik Steringer 2019. This file is part of Principal Mapper.
 #
 #      Principal Mapper is free software: you can redistribute it and/or modify
 #      it under the terms of the GNU Affero General Public License as published by
@@ -18,19 +20,6 @@
 #
 #      You should have received a copy of the GNU Affero General Public License
 #      along with Principal Mapper.  If not, see <https://www.gnu.org/licenses/>.
-#
-#      Principal Mapper is free software: you can redistribute it and/or modify
-#      it under the terms of the GNU Affero General Public License as published by
-#      the Free Software Foundation, either version 3 of the License, or
-#      (at your option) any later version.
-#
-#      Principal Mapper is distributed in the hope that it will be useful,
-#      but WITHOUT ANY WARRANTY; without even the implied warranty of
-#      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#      GNU General Public License for more details.
-#
-#      You should have received a copy of the GNU Affero General Public License
-#      along with Foobar.  If not, see <https://www.gnu.org/licenses/>.
 
 import json
 import os

diff --git a/principalmapper/common/groups.py b/principalmapper/common/groups.py
@@ -1,6 +1,8 @@
 """Python code for handling AWS IAM groups"""
 
-#  Copyright NCC Group (c) 2019. This file is part of Principal Mapper.
+
+
+#  Copyright (c) NCC Group and Erik Steringer 2019. This file is part of Principal Mapper.
 #
 #      Principal Mapper is free software: you can redistribute it and/or modify
 #      it under the terms of the GNU Affero General Public License as published by
@@ -14,19 +16,6 @@
 #
 #      You should have received a copy of the GNU Affero General Public License
 #      along with Principal Mapper.  If not, see <https://www.gnu.org/licenses/>.
-#
-#      Principal Mapper is free software: you can redistribute it and/or modify
-#      it under the terms of the GNU Affero General Public License as published by
-#      the Free Software Foundation, either version 3 of the License, or
-#      (at your option) any later version.
-#
-#      Principal Mapper is distributed in the hope that it will be useful,
-#      but WITHOUT ANY WARRANTY; without even the implied warranty of
-#      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#      GNU General Public License for more details.
-#
-#      You should have received a copy of the GNU Affero General Public License
-#      along with Foobar.  If not, see <https://www.gnu.org/licenses/>.
 
 from typing import List
 from typing import Optional

diff --git a/principalmapper/common/nodes.py b/principalmapper/common/nodes.py
@@ -1,6 +1,8 @@
 """Python code for implementing the nodes of a graph"""
 
-#  Copyright NCC Group (c) 2019. This file is part of Principal Mapper.
+
+
+#  Copyright (c) NCC Group and Erik Steringer 2019. This file is part of Principal Mapper.
 #
 #      Principal Mapper is free software: you can redistribute it and/or modify
 #      it under the terms of the GNU Affero General Public License as published by
@@ -14,19 +16,6 @@
 #
 #      You should have received a copy of the GNU Affero General Public License
 #      along with Principal Mapper.  If not, see <https://www.gnu.org/licenses/>.
-#
-#      Principal Mapper is free software: you can redistribute it and/or modify
-#      it under the terms of the GNU Affero General Public License as published by
-#      the Free Software Foundation, either version 3 of the License, or
-#      (at your option) any later version.
-#
-#      Principal Mapper is distributed in the hope that it will be useful,
-#      but WITHOUT ANY WARRANTY; without even the implied warranty of
-#      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#      GNU General Public License for more details.
-#
-#      You should have received a copy of the GNU Affero General Public License
-#      along with Foobar.  If not, see <https://www.gnu.org/licenses/>.
 
 from typing import List, Optional
 

diff --git a/principalmapper/common/policies.py b/principalmapper/common/policies.py
@@ -1,7 +1,7 @@
 """Python code for handling AWS IAM policies"""
 
 
-#  Copyright NCC Group (c) 2019. This file is part of Principal Mapper.
+#  Copyright (c) NCC Group and Erik Steringer 2019. This file is part of Principal Mapper.
 #
 #      Principal Mapper is free software: you can redistribute it and/or modify
 #      it under the terms of the GNU Affero General Public License as published by
@@ -15,19 +15,6 @@
 #
 #      You should have received a copy of the GNU Affero General Public License
 #      along with Principal Mapper.  If not, see <https://www.gnu.org/licenses/>.
-#
-#      Principal Mapper is free software: you can redistribute it and/or modify
-#      it under the terms of the GNU Affero General Public License as published by
-#      the Free Software Foundation, either version 3 of the License, or
-#      (at your option) any later version.
-#
-#      Principal Mapper is distributed in the hope that it will be useful,
-#      but WITHOUT ANY WARRANTY; without even the implied warranty of
-#      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#      GNU General Public License for more details.
-#
-#      You should have received a copy of the GNU Affero General Public License
-#      along with Foobar.  If not, see <https://www.gnu.org/licenses/>.
 
 class Policy(object):
     """A class representing a single IAM policy"""

diff --git a/principalmapper/graphing/__init__.py b/principalmapper/graphing/__init__.py
@@ -1,4 +1,4 @@
-#  Copyright NCC Group (c) 2019. This file is part of Principal Mapper.
+#  Copyright (c) NCC Group and Erik Steringer 2019. This file is part of Principal Mapper.
 #
 #      Principal Mapper is free software: you can redistribute it and/or modify
 #      it under the terms of the GNU Affero General Public License as published by
@@ -12,18 +12,5 @@
 #
 #      You should have received a copy of the GNU Affero General Public License
 #      along with Principal Mapper.  If not, see <https://www.gnu.org/licenses/>.
-#
-#      Principal Mapper is free software: you can redistribute it and/or modify
-#      it under the terms of the GNU Affero General Public License as published by
-#      the Free Software Foundation, either version 3 of the License, or
-#      (at your option) any later version.
-#
-#      Principal Mapper is distributed in the hope that it will be useful,
-#      but WITHOUT ANY WARRANTY; without even the implied warranty of
-#      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#      GNU General Public License for more details.
-#
-#      You should have received a copy of the GNU Affero General Public License
-#      along with Foobar.  If not, see <https://www.gnu.org/licenses/>.
 
 """Module for graphing code"""
diff --git a/principalmapper/graphing/cloudformation_edges.py b/principalmapper/graphing/cloudformation_edges.py
@@ -1,6 +1,6 @@
 """Code to identify if a principal in an AWS account can use access to CloudFormation to access other principals."""
 
-#  Copyright NCC Group (c) 2019. This file is part of Principal Mapper.
+#  Copyright (c) NCC Group and Erik Steringer 2019. This file is part of Principal Mapper.
 #
 #      Principal Mapper is free software: you can redistribute it and/or modify
 #      it under the terms of the GNU Affero General Public License as published by
@@ -14,19 +14,6 @@
 #
 #      You should have received a copy of the GNU Affero General Public License
 #      along with Principal Mapper.  If not, see <https://www.gnu.org/licenses/>.
-#
-#      Principal Mapper is free software: you can redistribute it and/or modify
-#      it under the terms of the GNU Affero General Public License as published by
-#      the Free Software Foundation, either version 3 of the License, or
-#      (at your option) any later version.
-#
-#      Principal Mapper is distributed in the hope that it will be useful,
-#      but WITHOUT ANY WARRANTY; without even the implied warranty of
-#      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#      GNU General Public License for more details.
-#
-#      You should have received a copy of the GNU Affero General Public License
-#      along with Foobar.  If not, see <https://www.gnu.org/licenses/>.
 
 import io
 import os