Browse Source

extract scripts from package and add them to setup file

master
Edoardo Putti 7 years ago
parent
commit
a5c72c9589
12 changed files with 56 additions and 31 deletions
  1. +1
    -1
      bin/ca-server
  2. +20
    -0
      bin/ca-shell
  3. +5
    -5
      ca_manager/lookup.py
  4. +5
    -5
      ca_manager/manager.py
  5. +4
    -4
      ca_manager/models/authority.py
  6. +3
    -3
      ca_manager/models/certificate.py
  7. +2
    -1
      ca_manager/models/customModel.py
  8. +1
    -1
      ca_manager/models/request.py
  9. +4
    -4
      ca_manager/models/ssh.py
  10. +4
    -4
      ca_manager/models/ssl.py
  11. +3
    -3
      ca_manager/shell.py
  12. +4
    -0
      setup.py

ca_manager/request_server.py → bin/ca-server View File


+ 20
- 0
bin/ca-shell View File

@ -0,0 +1,20 @@
#!/usr/bin/env python3
# -*- coding: utf-8 -*-
from ca_manager.manager import CAManager, init_manager
from ca_manager.paths import *
from ca_manager.shell import CAManagerShell
if __name__ == '__main__':
init_manager([
MANAGER_PATH,
REQUESTS_PATH,
OUTPUT_PATH,
RESULTS_PATH,
])
ca_manager = CAManager(MANAGER_PATH)
CAManagerShell(ca_manager).cmdloop()

+ 5
- 5
ca_manager/lookup.py View File

@ -6,13 +6,13 @@ import json
import os
import os.path
from models.ssh import SSHAuthority, UserSSHRequest, HostSSHRequest
from models.ssl import SSLAuthority, HostSSLRequest, CASSLRequest
from .models.ssh import SSHAuthority, UserSSHRequest, HostSSHRequest
from .models.ssl import SSLAuthority, HostSSLRequest, CASSLRequest
from models.certificate import Certificate
from models.request import SignRequest
from .models.certificate import Certificate
from .models.request import SignRequest
from paths import *
from .paths import *
class CALookup:
"""


+ 5
- 5
ca_manager/manager.py View File

@ -7,13 +7,13 @@ import shutil
from playhouse.gfk import *
from lookup import CALookup, RequestLookup, CertificateLookup
from .lookup import CALookup, RequestLookup, CertificateLookup
from models.ssh import SSHAuthority
from models.ssl import SSLAuthority
from models.certificate import Certificate
from .models.ssh import SSHAuthority
from .models.ssl import SSLAuthority
from .models.certificate import Certificate
from paths import *
from .paths import *
__doc__ = """
Define classes to interact with certificate requests and Certification Authority


+ 4
- 4
ca_manager/models/authority.py View File

@ -8,16 +8,16 @@ from datetime import datetime
import os
import os.path
from models import customModel
from models.certificate import Certificate
from .customModel import CustomModel
from .certificate import Certificate
from paths import *
from ..paths import *
__doc__= """
Module of base classes to handle authorities
"""
class Authority(customModel.CustomModel):
class Authority(CustomModel):
signed_certificates = ReverseGFK(Certificate, 'authority_type', 'authority_id')


+ 3
- 3
ca_manager/models/certificate.py View File

@ -6,12 +6,12 @@ from playhouse.gfk import *
import os
import json
from models import customModel
from .customModel import CustomModel
from paths import *
from ..paths import *
class Certificate(customModel.CustomModel):
class Certificate(CustomModel):
"""
"""


+ 2
- 1
ca_manager/models/customModel.py View File

@ -1,7 +1,8 @@
from paths import *
from playhouse.gfk import *
import os
from ..paths import *
custom_db = SqliteDatabase(os.path.join(MANAGER_PATH, 'ca_manager.db'))
class CustomModel(Model):


+ 1
- 1
ca_manager/models/request.py View File

@ -3,7 +3,7 @@
import os.path
from paths import *
from ..paths import *
__doc__= """
Module of classes to handle sign requests


+ 4
- 4
ca_manager/models/ssh.py View File

@ -6,10 +6,10 @@ from playhouse.gfk import *
import os.path
import subprocess
from models.authority import Authority
from models.certificate import Certificate
from models.request import SignRequest
from paths import *
from .authority import Authority
from .certificate import Certificate
from .request import SignRequest
from ..paths import *
class UserSSHRequest(SignRequest):
def __init__(self, req_id, user_name, root_requested, key_data):


+ 4
- 4
ca_manager/models/ssl.py View File

@ -7,10 +7,10 @@ import os
from inspect import getsourcefile
import subprocess
from models.authority import Authority
from models.certificate import Certificate
from models.request import SignRequest
from paths import *
from .authority import Authority
from .certificate import Certificate
from .request import SignRequest
from ..paths import *
import json


+ 3
- 3
ca_manager/shell.py View File

@ -4,10 +4,10 @@ import cmd
import sys
from datetime import datetime
from models.ssh import SSHAuthority
from models.ssl import SSLAuthority
from ca_manager.models.ssh import SSHAuthority
from ca_manager.models.ssl import SSLAuthority
from manager import sign_request
from ca_manager.manager import sign_request
__doc__ = """
Class to make a shell and interact with the user


+ 4
- 0
setup.py View File

@ -13,5 +13,9 @@ setup(
install_requires=[
'peewee',
],
scripts=[
'bin/ca-server',
'bin/ca-shell',
],
zip_safe=False
)

Loading…
Cancel
Save