lauri/certidude
1
0
Fork 0
mirror of https://github.com/laurivosandi/certidude synced 2024-12-22 16:25:17 +00:00
Code Issues Activity

Merge pull request #38 from plaes/wip

Browse Source 
Misc cleanups
This commit is contained in:
Lauri Võsandi 2018-01-05 22:25:43 +02:00 committed by GitHub
commit 388f58574b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
certidude/cli.py
View File

@ -1,14 +1,11 @@
# coding: utf-8 # coding: utf-8
import asyncore
import click import click
import hashlib import hashlib
import logging import logging
import os import os
import random import random
import re
import signal import signal
import socket
import string import string
import subprocess import subprocess
import sys import sys
@ -17,13 +14,12 @@ from base64 import b64encode
from certbuilder import CertificateBuilder, pem_armor_certificate from certbuilder import CertificateBuilder, pem_armor_certificate
from certidude import const from certidude import const
from csrbuilder import CSRBuilder, pem_armor_csr from csrbuilder import CSRBuilder, pem_armor_csr
from configparser import ConfigParser, NoOptionError, NoSectionError from configparser import ConfigParser, NoOptionError
from certidude.common import apt, rpm, pip, drop_privileges, selinux_fixup from certidude.common import apt, rpm, drop_privileges, selinux_fixup
from datetime import datetime, timedelta from datetime import datetime, timedelta
from glob import glob from glob import glob
from ipaddress import ip_network from ipaddress import ip_network
from oscrypto import asymmetric from oscrypto import asymmetric
from time import sleep
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -1350,7 +1346,6 @@ def certidude_expire():
@click.option("-l", "--listen", default="127.0.1.1", help="Listen address") @click.option("-l", "--listen", default="127.0.1.1", help="Listen address")
@click.option("-f", "--fork", default=False, is_flag=True, help="Fork to background") @click.option("-f", "--fork", default=False, is_flag=True, help="Fork to background")
def certidude_serve(port, listen, fork): def certidude_serve(port, listen, fork):
import pwd
from certidude import authority, const, push from certidude import authority, const, push
if port == 80: if port == 80:

5
certidude/config.py
View File

@ -1,13 +1,8 @@
import click
import codecs
import configparser import configparser
import ipaddress import ipaddress
import os import os
import string
from certidude import const from certidude import const
from collections import OrderedDict from collections import OrderedDict
from random import choice
# Options that are parsed from config file are fetched here # Options that are parsed from config file are fetched here

5
setup.py
View File

@ -19,8 +19,11 @@ setup(
long_description=open("README.rst").read(), long_description=open("README.rst").read(),
# Include here only stuff required to run certidude client # Include here only stuff required to run certidude client
install_requires=[ install_requires=[
"asn1crypto",
"click", "click",
"configparser" "configparser",
"certbuilder",
"csrbuilder",
], ],
scripts=[ scripts=[
"misc/certidude" "misc/certidude"