Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

A new test (dot1x) and a new tool (wpa) which was implemented to test 802.1X availability #1093

Open
wants to merge 21 commits into
base: 4.4.0
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
0c2fcda
* A new test (dot1x) and a new tool (wpa) which was implemented to te…
krihal Dec 2, 2020
a6e39e9
Removed misc/ folder which should not be there.
krihal Dec 2, 2020
2955730
Minor changed to Debian build files.
krihal Dec 2, 2020
2e2f827
Replace dot1x with the more specific name 802.1x.
krihal Dec 3, 2020
f05fc2d
Better result formatting.
krihal Dec 3, 2020
b39cd8c
Limit specs are deprecated.
krihal Dec 3, 2020
8270bf4
Remove the driver parameter since we don't use it.
krihal Dec 3, 2020
532383c
This type of limit is deprecated, removing function.
krihal Dec 3, 2020
e5d0043
Changed perfsonar_auto_version, should be 4.4.0
krihal Dec 3, 2020
9c2214c
Rename the tool wpa to wpa-supplicant.
krihal Dec 3, 2020
6273b30
Adjusted timeouts and sleeps to more resonable values.
krihal Dec 3, 2020
c006b77
Make sure we install sudo rules for dhclient.
krihal Dec 3, 2020
0d25ccf
Change dependencies for Debian.
krihal Dec 3, 2020
10f6b20
Updated RPM build spec to install sudo config for dhclient.
krihal Dec 4, 2020
3256b3c
Check return values for failures when running external programs.
krihal Dec 4, 2020
d85c794
* Addded two optional parameters, auth_inner and auth_outher to contr…
krihal Dec 4, 2020
db50e7d
No need to store the outcomes of tests in the result. If we have an b…
krihal Dec 4, 2020
6049838
Prefix username and password with _ so the API will not reveal it.
krihal Dec 4, 2020
a3ecfed
Store the error message in result-root.
krihal Dec 4, 2020
9cfb0cf
Make sure we have a supported EAP type.
krihal Dec 4, 2020
8c65714
It should be possible to pass an empty inner/outer auth configuration.
krihal Dec 4, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
175 changes: 175 additions & 0 deletions pscheduler-test-802.1x/802.1x/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,175 @@

Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

1. Definitions.

"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.

"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.

"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.

"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.

"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.

"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.

"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).

"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.

"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."

"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.

2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.

3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.

4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:

(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and

(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and

(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and

(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.

You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.

5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.

6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.

7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.

8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.

9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.
45 changes: 45 additions & 0 deletions pscheduler-test-802.1x/802.1x/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
#
# Makefile for any test class
#

NAME=802.1x

# TODO: Everything below this should be made into a template that can
# be included.

FILES=\
cli-to-spec \
enumerate \
participants \
result-format \
spec-format \
spec-is-valid \
spec-to-cli \
limit-is-valid \
limit-passes \


MODULES=\
validate \


PYS=$(MODULES:%=%.py)
PYCS=$(MODULES:%=%.pyc)

$(PYCS):
python -m compileall .
TO_CLEAN += $(PYCS)


install: $(FILES) $(PYS) $(PYCS)
ifndef DESTDIR
@echo No DESTDIR specified for installation
@false
endif
mkdir -p $(DESTDIR)
install -m 555 $(FILES) $(DESTDIR)
install -m 444 $(PYS) $(PYCS) $(DESTDIR)


clean:
rm -f $(TO_CLEAN) *~
102 changes: 102 additions & 0 deletions pscheduler-test-802.1x/802.1x/cli-to-spec
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
#!/usr/bin/env python3
#
# Convert comamnd-line options to a test specification
#


import pscheduler
import sys


if len(sys.argv) > 1:
# Args are on the command line
args = sys.argv[1:]

else:
# xArgs are in a JSON array on stdin
json_args = pscheduler.json_load(exit_on_error=True)
args = []

if type(json_args) != list:
pscheduler.fail("Invalid JSON for this operation")
for arg in json_args:
if type(arg) not in (str, int, float):
pscheduler.fail("Invalid JSON for this operation")
args = [str(arg) for arg in json_args]


# Gargle the arguments

opt_parser = pscheduler.FailingOptionParser(epilog=
"""Examples:

task 802.1x --interface eth0 --eap_type PEAP --username test --password test --eap_type PEAP
Run a PEAP authentisation with test/test as credentials and use eth0 as a wired interface.
"""
)

opt_parser.add_option("--timeout",
help="Duration of idle test.",
action="store", type="string",
dest="timeout")

opt_parser.add_option("--interface",
help="Interface to use",
action="store", type="string",
dest="interface")

opt_parser.add_option("--eap_type",
help="EAP type to use",
action="store", type="string",
dest="eap_type")

opt_parser.add_option("--username",
help="Username",
action="store", type="string",
dest="username")

opt_parser.add_option("--password",
help="Password",
action="store", type="string",
dest="password")

opt_parser.add_option("--auth_inner",
help="Inner authentication, optional",
action="store", type="string",
dest="auth_inner")

opt_parser.add_option("--auth_outer",
help="Outer authentication, optional",
action="store", type="string",
dest="auth_outer")

(options, remaining_args) = opt_parser.parse_args(args)

if len(remaining_args) != 0:
pscheduler.fail("Unusable arguments: %s" % " ".join(remaining_args))


result = {'schema': 1}

if options.timeout is not None:
result['timeout'] = options.timeout

if options.interface is not None:
result['interface'] = options.interface

if options.eap_type is not None:
result['eap_type'] = options.eap_type

if options.username is not None:
result['_username'] = options.username

if options.password is not None:
result['_password'] = options.password

if options.auth_inner is not None:
result['auth_inner'] = options.auth_inner

if options.auth_outer is not None:
result['auth_outer'] = options.auth_outer

pscheduler.succeed_json(result)
13 changes: 13 additions & 0 deletions pscheduler-test-802.1x/802.1x/enumerate
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#!/bin/sed -e 1d
{
"schema": 1,
"name": "802.1x",
"description": "Test 802.1X authorization.",
"version": "1.0",
"maintainer": {
"name": "Kristofer Hallin, SUNET",
"email": "[email protected]",
"href": "https://www.sunet.se"
},
"scheduling-class": "background"
}
9 changes: 9 additions & 0 deletions pscheduler-test-802.1x/802.1x/limit-is-valid
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/bin/sed -e 1d;/^#/d
#
# Validator for '802.1x' task limit spec
#

{
"valid": false,
"error": "This type of limit is deprecated and not supported by this test."
}
11 changes: 11 additions & 0 deletions pscheduler-test-802.1x/802.1x/limit-passes
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#!/bin/sh
#
# Checker for task limits
#

cat <<EOF
{
"passes": false,
"errors": "This type of limit is deprecated and not supported by this test."
}
EOF
29 changes: 29 additions & 0 deletions pscheduler-test-802.1x/802.1x/participants
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
#!/usr/bin/env python3
#
# Participant list generator for '8021x' test spec
#

import pscheduler

from validate import spec_is_valid

json = pscheduler.json_load(exit_on_error=True, max_schema=1)

null_reason = None

valid, message = spec_is_valid(json)

if not valid:
pscheduler.fail(message)

source = json.get("source-node", json.get("source", None))
if source is None:
null_reason = "No source specified"

participants = [source]

result = {"participants": participants}
if null_reason is not None:
result["null-reason"] = null_reason

pscheduler.succeed_json(result)
Loading