valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into sam_2014_02_03

Browse Source 
Conflicts:
	salt/transport/road/raet/packeting.py
This commit is contained in:
Samuel M Smith 2014-02-03 17:52:18 -07:00
commit a8e9239b23
17 changed files with 43 additions and 385 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
salt/transport/road/raet/__init__.py
View File

@ -1,3 +1,4 @@
# -*- coding: utf-8 -*-
'''
raet modules

5
salt/transport/road/raet/packeting.py
View File

@ -1,3 +1,4 @@
# -*- coding: utf-8 -*-
'''
packeting.py raet packet behaviors
@ -16,18 +17,14 @@ data =
}
head: dict of header fields
{
pack: packed version of header
}
neck: dict of authentication fields
{
pack: packed version of neck
}
body: dict of body fields
{
pack: packed version of body
}
pack: packed version of whole packet on tx and raw packet on rx

59
salt/transport/road/raet/raeting.py
View File

@ -1,3 +1,4 @@
# -*- coding: utf-8 -*-
'''
raeting module provides constants and values for the RAET protocol
@ -23,11 +24,11 @@ data =
sp: source ip port Default: 7532
dh: destination host ip address (ipv4) Default: '127.0.0.1'
dp: destination host ip port Default 7532
hk: header kind (HeadKind) Default 0
hk: header kind (HeadKind) Default 0
hl: header length (HeadLen) Default 0
nk: Neck header kind (NeckKind) Default '00' hs
nl: Neck header length (NeckLen) Default 0
bk: body kind (BodyKind) Default 0
bk: body kind (BodyKind) Default 0
bl: body length (BodyLen) Default 0
tk: tail kind (TailKind) Default 0
tl: tail length (TailLen) Default 0
@ -36,17 +37,17 @@ data =
{
hk: header kind (HeadKind) Default 0
hl: header length (HeadLen) Default 0
vn: version (Version) Default 0
sd: Source Device ID (SDID)
dd: Destination Device ID (DDID)
cf: Corresponder Flag (CrdrFlag) Default 0
mf: Multicast Flag (MultFlag) Default 0
si: Session ID (SID) Default 0
ti: Transaction ID (TID) Default 0
sk: Service Kind (SrvcKind)
pk: Packet Kind (PcktKind)
bf: Burst Flag (BrstFlag) Default 0
@ -57,25 +58,25 @@ data =
sn: Segment Number (SegNum) Default 0
sc: Segment Count (SegCnt) Default 1
pf: Pending Segment Flag (PendFlag) Default 0
Not the last segment more pending
Not the last segment more pending
af: All Flag (AllFlag) Default 0
Resend all segments not just one
nk: Neck header kind (NeckKind) Default '00' hs
nl: Neck header length (NeckLen) Default 0
bk: body kind (BodyKind) Default '00' hs
bl: body length (BodyLen) Default 0
tk: tail kind (TailKind) Default '00' hs
tl: tail length (TailLen) Default 0
fg: flags packed (Flags) Default '00' hs
2 byte Hex string with bits (0, 0, af, pf, 0, bf, mf, cf)
Zeros are TBD flags
pack: packed version of header
}
neck: dict of authentication fields
@ -147,34 +148,34 @@ SERVICE_KINDS = odict([('fireforget', 0), ('ackretry', 1), (
'unknown', 255)])
SERVICE_KIND_NAMES = odict((v,k) for k, v in SERVICE_KINDS.iteritems()) # inverse map
ServiceKind = namedtuple('ServiceKind', SERVICE_KINDS.keys())
serviceKinds = ServiceKind(**SERVICE_KINDS)
serviceKinds = ServiceKind(**SERVICE_KINDS)
PACKET_KINDS = odict([('data', 0), ('req', 1), ('ack', 8),
('nack', 9), ('unknown', 255)])
PACKET_KIND_NAMES = odict((v,k) for k, v in PACKET_KINDS.iteritems()) # inverse map
PacketKind = namedtuple('PacketKind', PACKET_KINDS.keys())
packetKinds = PacketKind(**PACKET_KINDS)
packetKinds = PacketKind(**PACKET_KINDS)
# default values of meta data, if given, lengths are integers
META_DEFAULTS = odict( [
META_DEFAULTS = odict( [
('sh', ''),
('sp', 7530),
('sp', 7530),
('dh', '127.0.0.1'),
('dp', 7530),
('vn', 0),
('vn', 0),
('hk', None),
('hl', None),
('nk', 0),
('nl', 0),
('bk', 0),
('bl', 0),
('tk', 0),
('tk', 0),
('tl', 0),
])
# head fields that may be included in json header if not default value
HEAD_DEFAULTS = odict( [
HEAD_DEFAULTS = odict( [
('hk', None),
('hl', None),
('vn', 0),
@ -197,7 +198,7 @@ HEAD_DEFAULTS = odict( [
('nl', 0),
('bk', 0),
('bl', 0),
('tk', 0),
('tk', 0),
('tl', 0),
])
@ -213,7 +214,7 @@ def defaultData(data=None):
data = odict()
for part in DATA_PARTS: # make sure all parts in data
if part not in data:
data[part] = odict()
data[part] = odict()
if 'pack' not in data:
data['pack'] = ''
return data
@ -277,7 +278,7 @@ def packHead(meta, head):
head['pack'] = ''
if head.get('hk') == headKinds.json:
kit = odict()
for field in META_LEN_FIELDS:
for field in META_LEN_FIELDS:
head[field] = meta[field]
for field in META_KIND_FIELDS:
head[field] = meta[field]
@ -370,12 +371,12 @@ def parseHead(pack, meta, head):
meta[field] = head[field]
for field in META_KIND_FIELDS:
meta[field] = head[field]
else: #notify unrecognizible packet
meta['hl'] = 0
meta['hl'] = 0
meta['hk'] = headKinds.unknown
meta['error'] = "Unrecognizible packet head."
return pack
@ -387,13 +388,13 @@ def parseNeck(pack, meta, neck):
meta['error'] = ''
nl = meta.get('nl', 0)
neck['pack'] = pack[:nl]
pack = pack[nl:]
pack = pack[nl:]
if meta.get('nk') == neckKinds.nada:
pass
else: #notify unrecognizible packet
meta['nl'] = 0
meta['nl'] = 0
meta['nk'] = neckKinds.unknown
meta['error'] = "Unrecognizible packet neck."
@ -435,7 +436,7 @@ def parseTail(pack, meta, tail):
meta['error'] = ''
tl = meta.get('tl', 0)
tail['pack'] = pack[:tl]
pack = pack[tl:]
pack = pack[tl:]
if meta.get('tk') == tailKinds.nada:
pass
@ -460,7 +461,7 @@ def verifyBody(meta, body, tail):
'''
Uses tail to verify body does not have errors
'''
#meta['error'] = "Body failed verification."
#meta['error'] = "Body failed verification."
return True

3
salt/transport/road/raet/stacking.py
View File

@ -1,3 +1,4 @@
# -*- coding: utf-8 -*-
'''
packeting.py raet protocol stacking behaviors
'''
@ -10,7 +11,7 @@ from ioflo.base.odicting import odict
from ioflo.base.globaling import *
from ioflo.base import aiding
from ioflo.base import storing
from ioflo.base import storing
from ioflo.base import deeding
from ioflo.base.consoling import getConsole

52
salt/transport/table/.gitignore vendored
View File

@ -1,52 +0,0 @@
/build
*.py[co]
*.swp
doc/_build
dist
MANIFEST
*~
*#
*.wpr
*.wpu
*.DS_Store
# virtualenv
# - ignores directories of a virtualenv when you create it right on
# top of salt such as
# - /some/path$ git clone https://github.com/thatch45/salt.git
# - /some/path$ virtualenv --python=/usr/bin/python2.6 salt
bin/
include/
lib/
pip/
share/
tests/integration/tmp/
# tox - ignore any tox-created virtualenv dirs
.tox
# setuptools stuff
*.egg-info
# code coverage outputs genereated by coverage.py
.coverage
coverage.xml
htmlcov/
# IDE files
/.project
/.pydevproject
/.idea
/.ropeproject
# ignore ctags file
tags
# ignore Vagrant file
Vagrantfile
.vagrant
# Compiled translation files should not be VCS'ed
# locale/zh_CN/LC_MESSAGES/topics/virt/nic.mo
*.mo
.doctrees

202
salt/transport/table/LICENSE
View File

@ -1,202 +0,0 @@
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.
END OF TERMS AND CONDITIONS
APPENDIX: How to apply the Apache License to your work.
To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "{}"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.
Copyright 2014 Thomas S Hatch
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.

43
salt/transport/table/README.rst
View File

@ -1,43 +0,0 @@
The Table Cryptographic Normalization System
============================================
.. note::
This library is currently experimental, no security claims are yet present
and is still undergoing extensive evaluation and heavy development
The idea is very simple, a single interface that simplifies cryptographic
routines to make complex libraries easy and safe to use.
Unified API
-----------
Table delivers a unified API, where the same commands can access different
cryptographic routines. This allows for backend routines to be easily swapped
in and out as time moves forward and the race for cryptographic security
continues.
Cryptographic Backends
----------------------
Backends are simplified, instead of large numbers of groups backends are
simplified into `public` for public key encryption, and `secret` for symmetric
encryption.
No Cryptographic Code
---------------------
This library has no cryptographic code, it only uses established and accepted
backend libraries to deliver simplified cryptographic routines.
Currently Available Public Key Backends
---------------------------------------
Curve 25519 via pynacl and libsodium
RSA via pycrypto and openssl
Currently Available Symmetric Backends
--------------------------------------
Salsa20 via pynacl and libsodium
AES via pycrypto and openssl

1
salt/transport/table/table/__init__.py → salt/transport/table/__init__.py
View File

@ -1,3 +1,4 @@
# -*- coding: utf-8 -*-
'''
Bring the cryptography to the table. This package aims to make a single very
high level cryptographic interface which abstracts many underlying algorithms.

1
salt/transport/table/table/handshake/__init__.py → salt/transport/table/handshake/__init__.py
View File

@ -1,3 +1,4 @@
# -*- coding: utf-8 -*-
'''
Package containing network handshakes
'''

1
salt/transport/table/table/handshake/raet_curvecp.py → salt/transport/table/handshake/raet_curvecp.py
View File

@ -1,3 +1,4 @@
# -*- coding: utf-8 -*-
'''
This handshake is based on the curvecp handshake, btu it modified to function
with the UDP/TCP RAET. This modification revolves primarily around the fact

1
salt/transport/table/table/public/__init__.py → salt/transport/table/public/__init__.py
View File

@ -1,3 +1,4 @@
# -*- coding: utf-8 -*-
'''
Package used to contain public key cryptography sequences
'''

1
salt/transport/table/table/public/pycrypto_rsa.py → salt/transport/table/public/pycrypto_rsa.py
View File

@ -1,3 +1,4 @@
# -*- coding: utf-8 -*-
'''
Manage RSA encryption via pycrypto

1
salt/transport/table/table/public/pynacl.py → salt/transport/table/public/pynacl.py
View File

@ -1,3 +1,4 @@
# -*- coding: utf-8 -*-
'''
Manage encryption with the pynacl bindings to libsodium

1
salt/transport/table/table/secret/__init__.py → salt/transport/table/secret/__init__.py
View File

@ -1,3 +1,4 @@
# -*- coding: utf-8 -*-
'''
Sync encryption normalization
'''

1
salt/transport/table/table/secret/pycrypto_aes.py → salt/transport/table/secret/pycrypto_aes.py
View File

@ -1,3 +1,4 @@
# -*- coding: utf-8 -*-
'''
table backend for aes using pycrypto
'''

1
salt/transport/table/table/secret/pynacl.py → salt/transport/table/secret/pynacl.py
View File

@ -1,3 +1,4 @@
# -*- coding: utf-8 -*-
'''
pynacl secret key encryption
'''

54
salt/transport/table/setup.py
View File

@ -1,54 +0,0 @@
#!/usr/bin/env python
'''
The setup script table
'''
import os
# Use setuptools only if the user opts-in by setting the USE_SETUPTOOLS env var
# This ensures consistent behavior but allows for advanced usage with
# virtualenv, buildout, and others.
USE_SETUPTOOLS = False
if 'USE_SETUPTOOLS' in os.environ:
try:
from setuptools import setup
USE_SETUPTOOLS = True
except:
USE_SETUPTOOLS = False
if USE_SETUPTOOLS is False:
from distutils.core import setup
NAME = 'table'
DESC = ('An multi backend crypto abstraction system')
VERSION = '0.1.0'
kwargs = {}
kwargs.update(
name=NAME,
version=VERSION,
description=DESC,
author='Thomas S Hatch',
author_email='thatch45@gmail.com',
url='http://red45.org',
classifiers=[
'Programming Language :: Python',
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
'Development Status :: 1 - Planning',
'License :: OSI Approved :: Apache Software License',
'Operating System :: POSIX :: Linux',
],
packages=[
'table',
'table.public',
'table.secret'],
)
if USE_SETUPTOOLS:
kwargs.update(
install_requires=open('requirements.txt').readlines(),
)
setup(**kwargs)